修改bug

Pu Zhibing

2025-02-10 24c1f8a945c6fbcb0968e9d78cf97e74f2677802

 guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java

@@ -119,7 +119,8 @@
      List<Vehicle> list = new ArrayList<>();
      if(null != year){
         for (Vehicle vehicle : vehicleList) {
            if("2".equals(year)){
            String vehicleGpsProtocol = vehicle.getVehicleGpsProtocol();
            if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
               list.add(vehicle);
            }
         }
@@ -137,9 +138,10 @@
      List<Ship> shipList = VideoGateway.getShipList(null, null, null, 0);
      List<Ship> list = new ArrayList<>();
      if(null != year){
         for (Ship vehicle : shipList) {
            if("2".equals(year)){
               list.add(vehicle);
         for (Ship ship : shipList) {
            String vehicleGpsProtocol = ship.getVehicleGpsProtocol();
            if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
               list.add(ship);
            }
         }
      }else{
@@ -196,8 +198,13 @@
   
   @PostMapping("/manualAudit")
   @ApiOperation(value = "人工审核视频通道数据", tags = {"任务记录"})
   public ResultUtil manualAudit(@RequestBody ManualAuditVo vo){
      return taskDetailService.manualAudit(vo);
   public ResultUtil manualAudit(@RequestBody ManualAuditVo vo, HttpServletRequest request){
      String token = request.getHeader(JwtConstants.AUTH_HEADER);
      if (token != null && token.startsWith("Bearer ")) {
         token = token.substring(token.indexOf(" ") + 1);
      }
      String userId = JwtTokenUtil.getPrivateClaimFromToken(token, "userId");
      return taskDetailService.manualAudit(vo, userId);
   }