From 4a627c5b353c20322149deaed036efc62ca06754 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 04 三月 2025 16:51:08 +0800
Subject: [PATCH] 修改演示版本的逻辑
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 4a1f01b..3c0fcf8 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
@@ -7,11 +7,13 @@
import com.stylefeng.guns.core.page.PageInfoBT;
import com.stylefeng.guns.core.util.JwtTokenUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Vehicles;
import com.stylefeng.guns.modular.system.model.enums.ImageModelEnum;
import com.stylefeng.guns.modular.system.model.enums.VideoChannelEnum;
import com.stylefeng.guns.modular.system.model.vo.*;
import com.stylefeng.guns.modular.system.service.IPatrolTaskService;
import com.stylefeng.guns.modular.system.service.ITaskDetailService;
+import com.stylefeng.guns.modular.system.service.IVehicleService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.videoGateway.VideoGateway;
import com.stylefeng.guns.modular.system.util.videoGateway.model.Ship;
@@ -42,6 +44,9 @@
@Resource
private ITaskDetailService taskDetailService;
+
+ @Resource
+ private IVehicleService vehicleService;
@@ -119,17 +124,14 @@
@GetMapping("/api/patrolTask/getVehicleList")
@ApiOperation(value = "获取车辆列表", tags = {"任务管理"})
public ResultUtil<List<Vehicle>> getVehicleList(Integer year){
- List<Vehicle> vehicleList = VideoGateway.getVehicleList(null, null, null, 0);
+ List<Vehicles> vehicles = vehicleService.selectList(null);
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;
+ for (Vehicles vehicle : vehicles) {
+ Vehicle vehicle1 = new Vehicle();
+ vehicle1.setId(vehicle.getId());
+ vehicle1.setVehicleNum(vehicle.getVehicleCode());
+ vehicle1.setCompanyName(vehicle.getCompanyName());
+ list.add(vehicle1);
}
return ResultUtil.success(list);
}
--
Gitblit v1.7.1