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

performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java

@@ -6,6 +6,7 @@ import com.clx.performance.param.temp.DriverTraceAddParam;
 import com.clx.performance.param.temp.TruckTraceAddParam;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.service.trace.TruckTraceService;
+import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.vo.pc.trace.DriverTraceVO;
 import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
@@ -54,6 +55,14 @@ public class TempTraceController {
 
         return Result.ok();
     }
+    @ApiOperation(value = "停留时长", notes = "<br>By:艾庆国")
+    @PostMapping("/getParkTime")
+    public Result<Integer> getParkTime(String truckNo, Long userNo, String beginTime, String endTime) {
+
+        int parkTime = truckTraceService.getParkTime(truckNo, userNo, LocalDateTimeUtils.parseTime(beginTime), LocalDateTimeUtils.parseTime(endTime));
+        return Result.ok(parkTime);
+    }
+
     @ApiOperation(value = "车辆轨迹同步", notes = "<br>By:艾庆国")
     @PostMapping("/truckTraceSync")
     public Result truckTraceSync(@RequestBody TruckTraceAddParam param) {

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

@@ -292,14 +292,14 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     }
 
     @Override
-    public int getParkTime(String truckNo, Long userNo) {
-        return getParkTime(truckNo, userNo, LocalDateTime.now().minusDays(1));
+    public int getParkTime(String truckNo, Long userNo, LocalDateTime beginDateTime) {
+        return getParkTime(truckNo, userNo, beginDateTime, LocalDateTime.now());
     }
 
     @Override
-    public int getParkTime(String truckNo, Long userNo, LocalDateTime beginDateTime) {
+    public int getParkTime(String truckNo, Long userNo, LocalDateTime beginDateTime, LocalDateTime endDateTime) {
         String beginTime = LocalDateTimeUtils.formatTime(beginDateTime);
-        String endTime = LocalDateTimeUtils.formatTime();
+        String endTime = LocalDateTimeUtils.formatTime(endDateTime);
 
         // 车辆
         // 非停留最大时间
@@ -313,7 +313,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         );
 
         String time = beginTime;
-        if (!list.isEmpty()){list.get(0).getGpsTime();}
+        if (!list.isEmpty()){time = list.get(0).getGpsTime();}
         // 停留时间段
         list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                 .eq(TruckTraceESPlus::getTruckNo, truckNo)
@@ -337,7 +337,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .limit(1)
         );
         time = beginTime;
-        if (!list1.isEmpty()){list1.get(0).getPositionTime();}
+        if (!list1.isEmpty()){time = list1.get(0).getPositionTime();}
         list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
                 .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)

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

@@ -96,7 +96,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
         orderChild.setLoadTime(commonInfo.getGotoReceiveTime());
 
         // 停留时间
-        int parkTime = truckTraceService.getParkTime(vehicleWarnChild.getTruckNo(), vehicleWarnChild.getDriverUserNo());
+        int parkTime = truckTraceService.getParkTime(vehicleWarnChild.getTruckNo(), vehicleWarnChild.getDriverUserNo(), vehicleWarnChild.getTakeTime());
         log.info("敏感区停留超时,停留时间:{}", parkTime);
         if (parkTime < PARK_TIMEOUT_DEFAULT) {return;}
 

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

@@ -20,8 +20,8 @@ public interface TruckTraceService {
 
     BigDecimal[] getCurrentPosition(String truckNo, Long userNo);
 
-    int getParkTime(String truckNo, Long userNo);
-    int getParkTime(String truckNo, Long userNo, LocalDateTime beginTime);
+    int getParkTime(String truckNo, Long userNo, LocalDateTime beginDateTime);
+    int getParkTime(String truckNo, Long userNo, LocalDateTime beginTime, LocalDateTime endTime);
 
 
     BigDecimal[] getCurrentTruckPosition(String truckNo);