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

performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTraceVO.java

@@ -22,6 +22,8 @@ public class DriverTraceVO {
     private BigDecimal speed;
     @ApiModelProperty(value = "停留时长（min）", example = "12.3")
     private BigDecimal stayTime=BigDecimal.ZERO;
+    @ApiModelProperty(value = "停留开始时间")
+    private String stayBeginTime;
     @ApiModelProperty(value = "停留结束时间")
     private String stayEndTime;
     @ApiModelProperty(value = "车辆状态：1空车 2重车", example = "1")

performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTruckTraceVO.java

@@ -26,6 +26,8 @@ public class DriverTruckTraceVO {
     private BigDecimal latitude;
     @ApiModelProperty(value = "GPS 时间")
     private String gpsTime;
+    @ApiModelProperty(value = "停留开始时间")
+    private String stayBeginTime;
     @ApiModelProperty(value = "停留结束时间")
     private String stayEndTime;
     @ApiModelProperty(value = "停留时长（min）", example = "12.3")

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;
@@ -55,6 +56,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/dao/impl/vehiclewarn/VehicleWarnChildDaoImpl.java

@@ -15,19 +15,10 @@ public class VehicleWarnChildDaoImpl extends BaseDaoImpl<VehicleWarnChildMapper,
 
 
     @Override
-    public boolean updateTraceTime(VehicleWarnChild item) {
+    public boolean updateWarnStatus(VehicleWarnChild item) {
         return update(lUdWrapper()
                 .eq(VehicleWarnChild::getId, item.getId())
-                .set(VehicleWarnChild::getTraceStatus, item.getTraceStatus())
-                .set(VehicleWarnChild::getTraceTime, item.getTraceTime())
-        );
-    }
-
-    @Override
-    public boolean updateReceiveAddressDistance(VehicleWarnChild item) {
-        return update(lUdWrapper()
-                .eq(VehicleWarnChild::getId, item.getId())
-                .set(VehicleWarnChild::getReceiveAddressDistance, item.getReceiveAddressDistance())
+                .set(VehicleWarnChild::getWarnStatus, item.getWarnStatus())
         );
     }
 
@@ -48,12 +39,17 @@ public class VehicleWarnChildDaoImpl extends BaseDaoImpl<VehicleWarnChildMapper,
 
     @Override
     public List<VehicleWarnChild> ListTruckNoOfTrace() {
-        return list(lQrWrapper().select(VehicleWarnChild::getChildNo, VehicleWarnChild::getTruckNo).eq(VehicleWarnChild::getTraceStatus, VehicleWarnChildEnum.TraceStatus.ENABLE.getCode()));
+        return list(lQrWrapper().select(VehicleWarnChild::getChildNo, VehicleWarnChild::getTruckNo)
+                .eq(VehicleWarnChild::getWarnStatus, VehicleWarnChildEnum.WarnStatus.ENABLE.getCode()));
     }
 
     @Override
     public List<VehicleWarnChild> ListTruckNoOfWarn() {
-        return list(lQrWrapper().select(VehicleWarnChild::getChildNo, VehicleWarnChild::getTruckNo).eq(VehicleWarnChild::getTraceStatus, VehicleWarnChildEnum.WarnStatus.ENABLE.getCode()));
+        return list(lQrWrapper().select(VehicleWarnChild::getChildNo, VehicleWarnChild::getTruckNo)
+                .eq(VehicleWarnChild::getWarnStatus, VehicleWarnChildEnum.WarnStatus.ENABLE.getCode())
+                .orderByDesc(VehicleWarnChild::getId)
+                .last("limit 10000")
+        );
 
     }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/vehiclewarn/VehicleWarnLogDaoImpl.java

@@ -4,15 +4,11 @@ package com.clx.performance.dao.impl.vehiclewarn;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
-import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class VehicleWarnLogDaoImpl extends BaseDaoImpl<VehicleWarnLogMapper, VehicleWarnLog, Integer> implements VehicleWarnLogDao {
 
-    @Override
-    public Optional<VehicleWarnLog> findById(Integer id) {
-        return null;
-    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnChildDao.java

@@ -9,8 +9,7 @@ import java.util.List;
 
 public interface VehicleWarnChildDao extends BaseDao<VehicleWarnChildMapper, VehicleWarnChild, Integer> {
 
-    boolean updateTraceTime(VehicleWarnChild item);
-    boolean updateReceiveAddressDistance(VehicleWarnChild item);
+    boolean updateWarnStatus(VehicleWarnChild item);
     boolean updateEstimateLoadTime(VehicleWarnChild item);
     Optional<VehicleWarnChild> findByChildNo(String childNo);
 

performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnLogDao.java

@@ -2,11 +2,9 @@ package com.clx.performance.dao.vehiclewarn;
 
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
-import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
 public interface VehicleWarnLogDao extends BaseDao<VehicleWarnLogMapper, VehicleWarnLog, Integer> {
 
-    Optional<VehicleWarnLog> findById(Integer id);
 
 }

performance-web/src/main/java/com/clx/performance/job/vehiclewarn/VehicleWarnJob.java

@@ -41,9 +41,6 @@ public class VehicleWarnJob {
 
             for (VehicleWarnChild item : list) {
 
-                LocalDateTime now = LocalDateTime.now();
-                LocalDateTime beginTime = now.minusSeconds(600);
-
                 // 发送mq (车辆预警)
                 vehicleWarnMqService.truckWarn(item.getChildNo());
             }
@@ -55,22 +52,4 @@ public class VehicleWarnJob {
 
     }
 
-//    /**
-//     * 预警暂停取消
-//     */
-//    @XxlJob("vehicleWarnSuspendCancel")
-//    public void vehicleWarnSuspendCancel() {
-//
-//        try {
-//
-//            List<VehicleWarnInfo> list = vehicleWarnInfoDao.listSuspendTimeout();
-//            log.info("预警暂停取消, size:{}", list.size());
-//
-//            vehicleWarnInfoDao.batchUpdateStatus(list.stream().map(item->item.getId()).collect(Collectors.toList()), VehicleWarnInfoEnum.Status.INIT.getCode());
-//
-//        } catch (Exception e) {
-//            log.warn("预警暂停取消失败，异常原因:{}", ExceptionUtils.getStackTrace(e));
-//            JobLog.error("预警暂停取消失败，异常原因=====================", e);
-//        }
-//    }
 }

performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnChild.java

@@ -42,7 +42,7 @@ public class VehicleWarnChild  implements HasKey<Integer> {
     private LocalDateTime estimateLoadTime;         //轨迹更新时间
     private LocalDateTime traceTime;                //轨迹更新时间
     private Integer traceStatus;                    //轨迹更新状态：0禁止 1启用
-    private Integer wanStatus;                      //预警更新状态：0禁用 1启用
+    private Integer warnStatus;                     //预警使能：0禁用 1启用
     private Integer status;                         //状态
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间

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

@@ -69,17 +69,29 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             }
             else {
                 if (parkIdx == null) {continue;}
-                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
-                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-                traceList.get(parkIdx).setStayEndTime(traceList.get(i).getGpsTime());
+                long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()),
+                        LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                BigDecimal stayTime = new BigDecimal(duration)
+                        .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+                for (int j= parkIdx; j<=i; j++){
+                    traceList.get(j).setStayTime(stayTime);
+                    traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
+                    traceList.get(j).setStayEndTime(traceList.get(i).getGpsTime());
+                }
                 parkIdx = null;
             }
         }
 
         if (parkIdx!=null && parkIdx < traceList.size()-1){
-            long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
-            traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-            traceList.get(parkIdx).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()),
+                    LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
+            BigDecimal stayTime = new BigDecimal(duration)
+                    .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+            for (int j= parkIdx; j<=traceList.size()-1; j++){
+                traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
+                traceList.get(j).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            }
         }
 
         return traceList;
@@ -98,17 +110,27 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             }
             else {
                 if (parkIdx == null) {continue;}
-                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
-                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-                traceList.get(parkIdx).setStayEndTime(traceList.get(i).getGpsTime());
+                long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                BigDecimal stayTime = new BigDecimal(duration)
+                        .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+                for (int j= parkIdx; j<=i; j++) {
+                    traceList.get(j).setStayTime(stayTime);
+                    traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
+                    traceList.get(j).setStayEndTime(traceList.get(i).getGpsTime());
+                }
                 parkIdx = null;
             }
         }
 
         if (parkIdx!=null && parkIdx < traceList.size()-1){
-            long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
-            traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-            traceList.get(parkIdx).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
+            BigDecimal stayTime = new BigDecimal(duration)
+                    .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+            for (int j= parkIdx; j<=traceList.size()-1; j++) {
+                traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
+                traceList.get(j).setStayEndTime(traceList.get(traceList.size() - 1).getGpsTime());
+            }
         }
 
         return traceList;
@@ -270,14 +292,16 @@ 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);
+
+        boolean flag = false;
 
         // 车辆
         // 非停留最大时间
@@ -291,7 +315,10 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         );
 
         String time = beginTime;
-        if (!list.isEmpty()){list.get(0).getGpsTime();}
+        if (!list.isEmpty()){
+            time = list.get(0).getGpsTime();
+            flag = true;        //车辆存在轨迹
+        }
         // 停留时间段
         list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                 .eq(TruckTraceESPlus::getTruckNo, truckNo)
@@ -304,26 +331,28 @@ 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>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
-                .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
                 .ge(DriverTraceESPlus::getSpeed, PARK_SPEED)
                 .ge(DriverTraceESPlus::getPositionTime, beginTime)
                 .le(DriverTraceESPlus::getPositionTime, endTime)
                 .orderByDesc("positionTime")
                 .limit(1)
         );
-        if (!list1.isEmpty()){
+        time = beginTime;
+        if (!list1.isEmpty()){time = list1.get(0).getPositionTime();}
         list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
-                    .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
-                    .ge(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
+                .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)
+                .gt(DriverTraceESPlus::getPositionTime, time)
                 .le(DriverTraceESPlus::getPositionTime, endTime)
                 .orderByDesc("positionTime")
         );
-            return (int)Duration.between(LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime())).toMinutes();
+        if (!list1.isEmpty()) {
+            return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime())).toMinutes();
         }
 
         return 0;

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

@@ -16,6 +16,7 @@ import com.clx.performance.dto.vehiclewarn.VehicleWarnCommonInfoDTO;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnChildEnum;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -87,7 +88,11 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         truckTraceSyncMqParam.setTruckNo(orderChild.getTruckNo());
         truckTraceSyncMqParam.setBeginTime(LocalDateTimeUtils.formatTime(LocalDateTime.now().minusMinutes(5)));
         truckTraceSyncMqParam.setEndTime(LocalDateTimeUtils.formatTime());
+        try {
             truckTraceMqHandlerService.truckTracSync(truckTraceSyncMqParam);
+        }catch (Exception e){
+            log.info("同步车辆轨迹失败, msg:{}", e.getMessage());
+        }
 
         // 计算预计时间
         BigDecimal[] currentPosition = vehicleWarnCommonService.getCurrentPosition(orderChild.getTruckNo(),
@@ -115,6 +120,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
 
         vehicleWarnChild.setTakeTime(orderChild.getPayTime());
         vehicleWarnChild.setTraceTime(LocalDateTime.now());
+        vehicleWarnChild.setWarnStatus(VehicleWarnChildEnum.WarnStatus.ENABLE.getCode());
 
         vehicleWarnChildDao.saveEntity(vehicleWarnChild);
     }
@@ -290,6 +296,17 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
             }
         }
 
+        if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.COMPLETE.getCode())
+                || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.DRIVER_CANCEL.getCode())
+                || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.PLATFORM_CANCEL.getCode())
+                || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.OWNER_CANCEL.getCode())
+                || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode())
+        ) {
+            // 运单结束不再预警
+            vehicleWarnChild.setWarnStatus(VehicleWarnChildEnum.TraceStatus.DISABLE.getCode());
+            vehicleWarnChildDao.updateWarnStatus(vehicleWarnChild);
+        }
+
     }
 
     @Override

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

@@ -76,7 +76,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
 
         // 超时判断
         int time = vehicleWarnConfig.getTimeoutRatio().multiply(new BigDecimal(MIN_FER_HOUR)).intValue();
-        if (parkTime > time){return;}
+        if (parkTime < time){return;}
 
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
@@ -91,7 +91,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());
         if (parkTime < PARK_TIMEOUT_DEFAULT) {return;}
 
         List<VehicleWarnConfig> vehicleWarnConfigList = vehicleWarnConfigDao.listByWarnType(VehicleWarnConfigEnum.WarnType.SENSITIVE_AREA_PARK_TIMEOUT.getCode());

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

@@ -39,9 +39,9 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void gotoSendAddressTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnCommonInfoDTO commonInfo){
-        if (vehicleWarnChild.getArriveReceiveExpectTime() == null) {return;}
+        if (vehicleWarnChild.getArriveSendExpectTime() == null) {return;}
 
-        long expectTime = vehicleWarnChild.getArriveReceiveExpectTime();
+        long expectTime = vehicleWarnChild.getArriveSendExpectTime();
 
         // 计算需要的时间
         Integer needTime = commonInfo.getSendAddressTime();

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