线路预警

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

@@ -52,20 +52,9 @@ public class VehicleWarnRangeServiceImpl implements VehicleWarnRangeService {
         vehicleWarnInfo.setWarnConfigId(vehicleWarnRangOld.getWarnConfigId());
         vehicleWarnInfo.setOrderGoodsNo(vehicleWarnRangOld.getOrderGoodsNo());
         vehicleWarnInfo.setChildNo(vehicleWarnRangOld.getChildNo());
+        vehicleWarnInfo.setSuspendTime(endTime);
         vehicleWarnInfoDao.updateSuspendTime(vehicleWarnInfo, vehicleWarnRangOld.getWarnRang());
 
-//        VehicleWarnLog vehicleWarnLog = new VehicleWarnLog();
-//        vehicleWarnLog.setInfoId(vehicleWarnInfo.getId());
-//        vehicleWarnLog.setType(VehicleWarnLogEnum.Type.SUSPEND.getCode());
-//        vehicleWarnLog.setContent(VehicleWarnLogEnum.Type.SUSPEND.getMsg());
-//        vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo());
-//        vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName());
-//        vehicleWarnLog.setWarnRang(param.getWarnRang());
-//        vehicleWarnLog.setWarnEndTime(endTime);
-//        vehicleWarnLog.setWarnTime(vehicleWarnInfo.getWarnTime());
-//        vehicleWarnLog.setCreateBy(loginUserInfo.getUserName());
-//        vehicleWarnLogDao.saveEntity(vehicleWarnLog);
-
         VehicleWarnRang vehicleWarnRang = new VehicleWarnRang();
         vehicleWarnRang.setWarnConfigId(vehicleWarnConfig.getId());
         vehicleWarnRang.setWarnName(vehicleWarnConfig.getWarnName());
@@ -85,9 +74,36 @@ public class VehicleWarnRangeServiceImpl implements VehicleWarnRangeService {
     @Override
     public void updateResume(VehicleWarnRangeResumeUpdateParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        LocalDateTime endTime = LocalDateTime.now().minusSeconds(1);
 
         VehicleWarnRang vehicleWarnRangOld = vehicleWarnRangeDao
                 .findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
+
+        VehicleWarnConfig vehicleWarnConfig = vehicleWarnConfigDao
+                .findById(vehicleWarnRangOld.getWarnConfigId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
+
+        VehicleWarnInfo vehicleWarnInfo = new VehicleWarnInfo();
+        vehicleWarnInfo.setWarnConfigId(vehicleWarnRangOld.getWarnConfigId());
+        vehicleWarnInfo.setOrderGoodsNo(vehicleWarnRangOld.getOrderGoodsNo());
+        vehicleWarnInfo.setChildNo(vehicleWarnRangOld.getChildNo());
+        vehicleWarnInfo.setSuspendTime(endTime);
+        vehicleWarnInfoDao.updateSuspendTime(vehicleWarnInfo, vehicleWarnRangOld.getWarnRang());
+
+        VehicleWarnRang vehicleWarnRang = new VehicleWarnRang();
+        vehicleWarnRang.setWarnConfigId(vehicleWarnConfig.getId());
+        vehicleWarnRang.setWarnName(vehicleWarnConfig.getWarnName());
+        vehicleWarnRang.setWarnRang(vehicleWarnRangOld.getWarnRang());
+        vehicleWarnRang.setOrderGoodsNo(vehicleWarnRangOld.getOrderGoodsNo());
+        vehicleWarnRang.setChildNo(vehicleWarnRangOld.getChildNo());
+        vehicleWarnRang.setWarnEndTime(endTime);
+        vehicleWarnRang.setStatus(VehicleWarnRangEnum.Status.ENABLE.getCode());
+        vehicleWarnRang.setCreateBy(loginUserInfo.getUserName());
+
+        // 禁用旧数据
+        vehicleWarnRangeDao.updateDisable(vehicleWarnRang);
+        // 新增新数据
+        vehicleWarnRangeDao.saveEntity(vehicleWarnRang);
+
     }
 
     @Override
@@ -99,6 +115,6 @@ public class VehicleWarnRangeServiceImpl implements VehicleWarnRangeService {
     public IPage<VehicleWarnRangDTO> pageRange(PageVehicleWarnRangeParam param) {
         Page<VehicleWarnRangDTO> page = vehicleWarnRangeStruct.convertPage(vehicleWarnRangeDao.pageByParam(param));
 
-        return null;
+        return page;
     }
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnRangeSqlProvider.java

@@ -18,7 +18,7 @@ public class VehicleWarnRangeSqlProvider {
 
             SELECT("*");
             FROM(TABLE);
-            WHERE("status = 1");
+            WHERE("(status = 1 and warn_end_time > now())");
             if (StringUtils.isNotBlank(param.getWarnName())) {WHERE("warn_name like CONCAT('%', #{param.warnName},'%')");}
             if (Objects.nonNull(param.getWarnRang())) {WHERE("warn_rang = #{param.warnRang}");}