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

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

@@ -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;
@@ -295,6 +297,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         // 司机
         List<DriverTraceESPlus> list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
+                .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
                 .ge(DriverTraceESPlus::getPositionTime, beginTime)
                 .le(DriverTraceESPlus::getPositionTime, endTime)
                 .orderByAsc("positionTime")
@@ -303,7 +306,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         if (!list1.isEmpty()){
             list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                     .eq(DriverTraceESPlus::getUserNo, userNo)
-                    .eq(DriverTraceESPlus::getSpeed, PARK_SPEED)
+                    .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
                     .ge(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
                     .le(DriverTraceESPlus::getPositionTime, endTime)
                     .orderByDesc("positionTime")

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);
 }