Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test

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

@@ -94,7 +94,7 @@ public class TraceMonitorServiceImpl implements TraceMonitorService {
         LocalDateTime beginTime = DateUtils.parseDateTime(param.getBeginTime()).get();
         LocalDateTime endTime = DateUtils.parseDateTime(param.getEndTime()).get();
         if (endTime.isAfter(beginTime.plusDays(TRACE_DAY_MAX)) ) {      //最多查询7天
-            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"选择的时间范围需小于7天");
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"选择的时间范围需小于"+TRACE_DAY_MAX+"天");
         }
     }
 }

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

@@ -42,7 +42,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     @Autowired
     private DriverTraceStruct driverTraceStruct;
 
-    private final static long stopMinutes = 5;
+    private final static long stopMinutes = 31;
 
     @Override
     public List<DriverTruckTraceVO> listTruckTraceByTime(String truckNo, String beginTime, String endTime) {