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

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 = 31;
+    private final static long stopMinutes = 35;
 
     @Override
     public List<DriverTruckTraceVO> listTruckTraceByTime(String truckNo, String beginTime, String endTime) {
@@ -56,6 +56,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     }
 
     //计算车辆的停留结束时间
+    @Override
     public List<DriverTruckTraceVO> calcTruckStayTime(List<DriverTruckTraceVO> traceList){
         // 停留时长计算
         Integer parkIdx = null;
@@ -84,6 +85,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     }
 
     //计算司机的停留结束时间
+    @Override
     public List<DriverTraceVO> calcDriverStayTime(List<DriverTraceVO> traceList){
         // 停留时长计算
         Integer parkIdx = null;

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

@@ -28,5 +28,11 @@ public interface TruckTraceService {
     List<List<DriverTraceVO>> splitDriverTrace(List<DriverTraceVO> driverTraceList);
 
 
+    //计算车辆的停留结束时间
+    List<DriverTruckTraceVO> calcTruckStayTime(List<DriverTruckTraceVO> traceList);
+
+    //计算司机的停留结束时间
+    List<DriverTraceVO> calcDriverStayTime(List<DriverTraceVO> traceList);
+
     List<List<DriverTruckTraceVO>> splitTruckTrace(List<DriverTruckTraceVO> traceList);
 }