运单预警

performance-api/src/main/java/com/clx/performance/enums/vehiclewarn/VehicleWarnConfigEnum.java

@@ -18,7 +18,7 @@ public enum VehicleWarnConfigEnum {
         GOTO_RECEIVE_TIMEOUT(4, "运单-前往目的地超时"),
 
         PARK_TIMEOUT(5, "运单-停留超时"),
-        YES(6, "运单-敏感区停留"),
+        SENSITIVE_AREA_PARK_TIMEOUT(6, "运单-敏感区停留"),
         LOAD_TIMEOUT(7, "运单-装车超时"),
         UNLOAD_TIMEOUT(8, "运单-卸车超时"),
         DELAY(9, "运单-运单延误"),

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

@@ -23,6 +23,14 @@ public class VehicleWarnChildDaoImpl extends BaseDaoImpl<VehicleWarnChildMapper,
         );
     }
 
+    @Override
+    public boolean updateReceiveAddressDistance(VehicleWarnChild item) {
+        return update(lUdWrapper()
+                .eq(VehicleWarnChild::getId, item.getId())
+                .set(VehicleWarnChild::getTraceTime, item.getTraceTime())
+        );
+    }
+
     @Override
     public Optional<VehicleWarnChild> findByChildNo(String childNo) {
         return Optional.of(childNo)

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

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl.vehiclewarn;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnInfoMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
@@ -50,6 +51,18 @@ public class VehicleWarnInfoDaoImpl extends BaseDaoImpl<VehicleWarnInfoMapper, V
                 .map(super::getOne);
     }
 
+    @Override
+    public Optional<VehicleWarnInfo> findEnableByChildNoAndWarnConfigType(String childNo, Integer warnConfigType) {
+        return Optional.of(childNo)
+                .map(item -> lQrWrapper()
+                        .eq(VehicleWarnInfo::getChildNo, childNo)
+                        .eq(VehicleWarnInfo::getWarnConfigId, warnConfigType)
+                        .ne(VehicleWarnInfo::getStatus, VehicleWarnInfoEnum.Status.RESOLVE.getCode())
+                        .last("limit 1")
+                )
+                .map(super::getOne);
+    }
+
     @Override
     public Optional<VehicleWarnInfo> findByWarnConfigType(Integer warnConfigType) {
         return Optional.of(warnConfigType)

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

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

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

@@ -14,6 +14,9 @@ public interface VehicleWarnInfoDao extends BaseDao<VehicleWarnInfoMapper, Vehic
 
     Optional<VehicleWarnInfo> findById(Integer id);
     Optional<VehicleWarnInfo> findByChildNoAndWarnConfigType(String childNo, Integer warnConfigType);
+
+    Optional<VehicleWarnInfo> findEnableByChildNoAndWarnConfigType(String childNo, Integer warnConfigType);
+
     Optional<VehicleWarnInfo> findByWarnConfigType(Integer warnConfigType);
 
     IPage<VehicleWarnInfo> pageByParam(PageVehicleWarnInfoParam param);

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

@@ -38,6 +38,7 @@ public class VehicleWarnChild  implements HasKey<Integer> {
     private Integer arriveSendExpectTime;           //预计到达货源地时间 （min）
     private Integer arriveReceiveExpectTime;        //预计到达目的地时间 （min）
     private LocalDateTime takeTime;                 //接单时间
+    private Integer receiveAddressDistance;      //距离目的地距离（m）
     private LocalDateTime traceTime;                //轨迹更新时间
     private Integer traceStatus;                    //轨迹更新状态：0禁止 1启用
     private Integer wanStatus;                      //预警更新状态：0禁用 1启用

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

@@ -72,15 +72,11 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
     }
 
     private void doGotoSendAddressTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnConfig vehicleWarnConfig, long expectTime, Integer needTime){
-        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findByChildNoAndWarnConfigType(vehicleWarnChild.getChildNo(), vehicleWarnConfig.getId()).orNull();
+        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findEnableByChildNoAndWarnConfigType(vehicleWarnChild.getChildNo(), vehicleWarnConfig.getId()).orNull();
 
         // 暂停检测
         boolean suspend = suspendCheck(vehicleWarnChild, vehicleWarnConfig.getId());
 
-        // 已处理
-        if (vehicleWarnInfo != null && Objects.equals(vehicleWarnInfo.getStatus(), VehicleWarnInfoEnum.Status.RESOLVE.getCode())){
-            return;
-        }
         // 已暂停
         if (vehicleWarnInfo != null && Objects.equals(vehicleWarnInfo.getStatus(), VehicleWarnInfoEnum.Status.SUSPEND.getCode())){
             if (suspend) {return;}
@@ -160,12 +156,7 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
     }
 
     private void doArriveSendAddressTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnConfig vehicleWarnConfig){
-        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findByChildNoAndWarnConfigType(vehicleWarnChild.getChildNo(), vehicleWarnConfig.getId()).orNull();
-
-        // 已处理
-        if (vehicleWarnInfo != null && Objects.equals(vehicleWarnInfo.getStatus(), VehicleWarnInfoEnum.Status.RESOLVE.getCode())){
-            return;
-        }
+        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findEnableByChildNoAndWarnConfigType(vehicleWarnChild.getChildNo(), vehicleWarnConfig.getId()).orNull();
 
         // 暂停检测
         boolean suspend = suspendCheck(vehicleWarnChild, vehicleWarnConfig.getId());

performance-web/src/main/java/com/clx/performance/utils/gd/GdService.java

@@ -33,33 +33,24 @@ public class GdService {
 
     private static final String REGEO_API = "https://restapi.amap.com/v3/geocode/regeo";//逆地理编码
 
-    private static final Integer STRATEGY_DEFAULT = 32;
-    private static final Integer STRATEGY_33 = 10;
 
 
     private String gaodeKey = "b2550e16bbc7bf9f6cd168e0f21709fc";
 
 
-    public List<GdRouteDTO> getRoute(BigDecimal originLongitude, BigDecimal originLatitude,
-                                     BigDecimal destinationLongitude, BigDecimal destinationLatitude, Integer strategy) {
-
-        return getRoute(gaodeKey, strategy, originLongitude, originLatitude, destinationLongitude, destinationLatitude);
-    }
-
     public List<GdRouteDTO> getRoute(BigDecimal originLongitude, BigDecimal originLatitude,
                                      BigDecimal destinationLongitude, BigDecimal destinationLatitude) {
 
-        return getRoute(gaodeKey, STRATEGY_DEFAULT, originLongitude, originLatitude, destinationLongitude, destinationLatitude);
+        return getRoute(gaodeKey, originLongitude, originLatitude, destinationLongitude, destinationLatitude);
     }
 
-    public static List<GdRouteDTO> getRoute(String key, Integer strategy, BigDecimal originLongitude, BigDecimal originLatitude,
+    public static List<GdRouteDTO> getRoute(String key, BigDecimal originLongitude, BigDecimal originLatitude,
                                                 BigDecimal destinationLongitude, BigDecimal destinationLatitude) {
         //log.info("高德线路规划开始");
         List<GdRouteDTO> routeList = new ArrayList<>();
 
         String url = DIRECTION_API+"?origin=" + originLongitude.doubleValue()+","+originLatitude.doubleValue()
                 + "&destination=" + destinationLongitude.doubleValue()+","+ destinationLatitude.doubleValue()
-                + "&strategy="+strategy
                 + "&output=json&key="+key+"&extensions=base&show_fields=cost,tmcs";
 
         //解析返回的结果