From 836df57f8158c86d0e4825b07cf745faa27d7389 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 21 一月 2025 11:35:17 +0800
Subject: [PATCH] 修改bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
index 0a3c29a..e2aaf84 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
+++ b/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);
}
--
Gitblit v1.7.1