运单预警

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

@@ -15,10 +15,10 @@ public class VehicleWarnChildDaoImpl extends BaseDaoImpl<VehicleWarnChildMapper,
 
 
     @Override
-    public boolean updateTraceStatus(VehicleWarnChild item) {
+    public boolean updateWarnStatus(VehicleWarnChild item) {
         return update(lUdWrapper()
                 .eq(VehicleWarnChild::getId, item.getId())
-                .set(VehicleWarnChild::getTraceStatus, item.getTraceStatus())
+                .set(VehicleWarnChild::getWarnStatus, item.getWarnStatus())
         );
     }
 
@@ -40,13 +40,13 @@ 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()));
+                .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())
+                .eq(VehicleWarnChild::getWarnStatus, VehicleWarnChildEnum.WarnStatus.ENABLE.getCode())
                 .orderByDesc(VehicleWarnChild::getId)
                 .last("limit 10000")
         );

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

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

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

@@ -55,22 +55,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/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java

@@ -120,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);
     }
@@ -302,8 +303,8 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
                 || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode())
         ) {
             // 运单结束不再预警
-            vehicleWarnChild.setTraceStatus(VehicleWarnChildEnum.TraceStatus.DISABLE.getCode());
-            vehicleWarnChildDao.updateTraceStatus(vehicleWarnChild);
+            vehicleWarnChild.setWarnStatus(VehicleWarnChildEnum.TraceStatus.DISABLE.getCode());
+            vehicleWarnChildDao.updateWarnStatus(vehicleWarnChild);
         }
 
     }