From 389b7f3b7025c62a0b723da8b26a3869fe5ecb40 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 十二月 2024 10:55:05 +0800
Subject: [PATCH] 修改过滤2023年协议数据bug

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 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 679b317..c523743 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
@@ -44,18 +44,22 @@
 	@GetMapping("/getTaskDetailList")
 	@ApiOperation(value = "获取任务列表数据", tags = {"任务管理"})
 	public PageInfoBT<TaskDetailList> getTaskDetailList(TaskDetailListVo vo){
-		Page<TaskDetailList> pageInfo = new Page(vo.getOffset(), vo.getPageSize());
+		Page<TaskDetailList> pageInfo = new Page(vo.getLimit(), vo.getOffset());
 		List<TaskDetailList> taskDetailList = taskDetailService.getTaskDetailList(pageInfo, vo);
 		pageInfo.setRecords(taskDetailList);
-		return super.packForBT(pageInfo);
+		PageInfoBT<TaskDetailList> taskDetailListPageInfoBT = super.packForBT(pageInfo);
+		taskDetailListPageInfoBT.setSize(vo.getOffset());
+		taskDetailListPageInfoBT.setCurrent(vo.getLimit());
+		return taskDetailListPageInfoBT;
 	}
 	
 	
 	
 	@DeleteMapping("/delTaskDetail")
 	@ApiOperation(value = "删除任务", tags = {"任务管理"})
-	public ResultUtil delTaskDetail(List<Integer> ids){
-		taskDetailService.delTaskDetail(ids);
+	public ResultUtil delTaskDetail(String ids){
+		List<String> id = Arrays.asList(ids.split(","));
+		taskDetailService.delTaskDetail(id);
 		return ResultUtil.success();
 	}
 	
@@ -110,18 +114,40 @@
 	
 	@GetMapping("/getVehicleList")
 	@ApiOperation(value = "获取车辆列表", tags = {"任务管理"})
-	public ResultUtil<List<Vehicle>> getVehicleList(){
+	public ResultUtil<List<Vehicle>> getVehicleList(Integer year){
 		List<Vehicle> vehicleList = VideoGateway.getVehicleList(null, null, null, 0);
-		return ResultUtil.success(vehicleList);
+		List<Vehicle> list = new ArrayList<>();
+		if(null != year){
+			for (Vehicle vehicle : vehicleList) {
+				String vehicleGpsProtocol = vehicle.getVehicleGpsProtocol();
+				if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
+					list.add(vehicle);
+				}
+			}
+		}else{
+			list = vehicleList;
+		}
+		return ResultUtil.success(list);
 	}
 	
 	
 	
 	@GetMapping("/getShipList")
 	@ApiOperation(value = "获取船舶列表", tags = {"任务管理"})
-	public ResultUtil<List<Ship>> getShipList(){
+	public ResultUtil<List<Ship>> getShipList(Integer year){
 		List<Ship> shipList = VideoGateway.getShipList(null, null, null, 0);
-		return ResultUtil.success(shipList);
+		List<Ship> list = new ArrayList<>();
+		if(null != year){
+			for (Ship ship : shipList) {
+				String vehicleGpsProtocol = ship.getVehicleGpsProtocol();
+				if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
+					list.add(ship);
+				}
+			}
+		}else{
+			list = shipList;
+		}
+		return ResultUtil.success(list);
 	}
 	
 	
@@ -129,10 +155,13 @@
 	@GetMapping("/getTaskRecordList")
 	@ApiOperation(value = "获取任务记录列表", tags = {"任务记录"})
 	public PageInfoBT<TaskRecordList> getTaskRecordList(TaskRecordListVo vo){
-		Page<TaskRecordList> pageInfo = new Page(vo.getOffset(), vo.getPageSize());
+		Page<TaskRecordList> pageInfo = new Page(vo.getLimit(), vo.getOffset());
 		List<TaskRecordList> taskRecordList = taskDetailService.getTaskRecordList(pageInfo, vo);
 		pageInfo.setRecords(taskRecordList);
-		return super.packForBT(pageInfo);
+		PageInfoBT<TaskRecordList> taskRecordListPageInfoBT = super.packForBT(pageInfo);
+		taskRecordListPageInfoBT.setSize(vo.getOffset());
+		taskRecordListPageInfoBT.setCurrent(vo.getLimit());
+		return taskRecordListPageInfoBT;
 	}
 	
 	
@@ -144,22 +173,25 @@
 		return ResultUtil.success(taskRecordInfo);
 	}
 	
-	@GetMapping("/getPictureDetailsVehicle")
+	@PostMapping("/getPictureDetailsVehicle")
 	@ApiOperation(value = "获取任务记录详情中的车船数据", tags = {"任务记录"})
-	public ResultUtil<PictureDetailsVehicle> getPictureDetailsVehicle(PictureDetailsVo vo){
+	public ResultUtil<PictureDetailsVehicle> getPictureDetailsVehicle(@RequestBody PictureDetailsVo vo){
 		PictureDetailsVehicle pictureDetailsVehicle = taskDetailService.getPictureDetailsVehicle(vo);
 		return ResultUtil.success(pictureDetailsVehicle);
 	}
 	
 	
 	
-	@GetMapping("/getPictureDetails")
+	@PostMapping("/getPictureDetails")
 	@ApiOperation(value = "获取任务记录详情中的视频通道数据", tags = {"任务记录"})
-	public PageInfoBT<PictureDetails> getPictureDetails(PictureDetailsVo vo){
-		Page<PictureDetails> pageInfo = new Page(vo.getOffset(), vo.getPageSize());
+	public PageInfoBT<PictureDetails> getPictureDetails(@RequestBody PictureDetailsVo vo){
+		Page<PictureDetails> pageInfo = new Page(vo.getLimit(), vo.getOffset());
 		List<PictureDetails> pictureDetails = taskDetailService.getPictureDetails(pageInfo, vo);
 		pageInfo.setRecords(pictureDetails);
-		return super.packForBT(pageInfo);
+		PageInfoBT<PictureDetails> pictureDetailsPageInfoBT = super.packForBT(pageInfo);
+		pictureDetailsPageInfoBT.setSize(vo.getOffset());
+		pictureDetailsPageInfoBT.setCurrent(vo.getLimit());
+		return pictureDetailsPageInfoBT;
 	}
 	
 	

--
Gitblit v1.7.1