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

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

@@ -301,6 +301,8 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         String beginTime = LocalDateTimeUtils.formatTime(beginDateTime);
         String endTime = LocalDateTimeUtils.formatTime(endDateTime);
 
+        boolean flag = false;
+
         // 车辆
         // 非停留最大时间
         List<TruckTraceESPlus> list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
@@ -313,7 +315,10 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         );
 
         String time = beginTime;
-        if (!list.isEmpty()){time = list.get(0).getGpsTime();}
+        if (!list.isEmpty()){
+            time = list.get(0).getGpsTime();
+            flag = true;        //车辆存在轨迹
+        }
         // 停留时间段
         list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                 .eq(TruckTraceESPlus::getTruckNo, truckNo)
@@ -326,6 +331,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             // 停留时长
             return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(0).getGpsTime())).toMinutes();
         }
+        if (flag) {return 0;}
 
         // 司机
         List<DriverTraceESPlus> list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()