删除演示代码和新增加1模型结果

Pu Zhibing

2024-12-27 b5ad78ef20d012da5efe3a087646dc65217547c7

 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{