Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java

@@ -283,19 +283,20 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByDesc("gpsTime")
                 .limit(1)
         );
-        if (!list.isEmpty()){
-            // 停留时间段
-            list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
-                    .eq(TruckTraceESPlus::getTruckNo, truckNo)
-                    .lt(TruckTraceESPlus::getSpeed, PARK_SPEED)
-                    .gt(TruckTraceESPlus::getGpsTime, list.get(0).getGpsTime())
-                    .le(TruckTraceESPlus::getGpsTime, endTime)
-                    .orderByDesc("gpsTime")
-            );
-            if (!list.isEmpty()) {
-                // 停留时长
-                return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(0).getGpsTime())).toMinutes();
-            }
+
+        String time = beginTime;
+        if (!list.isEmpty()){list.get(0).getGpsTime();}
+        // 停留时间段
+        list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
+                .eq(TruckTraceESPlus::getTruckNo, truckNo)
+                .lt(TruckTraceESPlus::getSpeed, PARK_SPEED)
+                .gt(TruckTraceESPlus::getGpsTime, time)
+                .le(TruckTraceESPlus::getGpsTime, endTime)
+                .orderByDesc("gpsTime")
+        );
+        if (!list.isEmpty()) {
+            // 停留时长
+            return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(0).getGpsTime())).toMinutes();
         }
 
         // 司机
@@ -307,17 +308,17 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByDesc("positionTime")
                 .limit(1)
         );
-        if (!list1.isEmpty()){
-            list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
-                    .eq(DriverTraceESPlus::getUserNo, userNo)
-                    .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)
-                    .gt(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
-                    .le(DriverTraceESPlus::getPositionTime, endTime)
-                    .orderByDesc("positionTime")
-            );
-            if (!list1.isEmpty()) {
-                return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime())).toMinutes();
-            }
+        time = beginTime;
+        if (!list1.isEmpty()){list1.get(0).getPositionTime();}
+        list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
+                .eq(DriverTraceESPlus::getUserNo, userNo)
+                .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)
+                .gt(DriverTraceESPlus::getPositionTime, time)
+                .le(DriverTraceESPlus::getPositionTime, endTime)
+                .orderByDesc("positionTime")
+        );
+        if (!list1.isEmpty()) {
+            return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime())).toMinutes();
         }
 
         return 0;

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java

@@ -27,6 +27,7 @@ import java.util.Objects;
 public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnService {
     private static final Integer MIN_FER_HOUR = 60;
     private static final Integer DISTANCE_DEFAULT = 2000;
+    private static final Integer PARK_TIMEOUT_DEFAULT = 5;
     @Autowired
     private VehicleWarnConfigDao vehicleWarnConfigDao;
     @Autowired
@@ -118,7 +119,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
         // 停留时间
         int parkTime = truckTraceService.getParkTime(vehicleWarnChild.getTruckNo(), vehicleWarnChild.getDriverUserNo());
         log.info("敏感区停留超时,停留时间:{}", parkTime);
-        if (parkTime == 0) {return;}
+        if (parkTime < PARK_TIMEOUT_DEFAULT) {return;}
 
         List<VehicleWarnConfig> vehicleWarnConfigList = vehicleWarnConfigDao.listByWarnType(VehicleWarnConfigEnum.WarnType.SENSITIVE_AREA_PARK_TIMEOUT.getCode());
         if (vehicleWarnConfigList.isEmpty()) {return;}