运单预警

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

@@ -5,9 +5,9 @@ import com.clx.performance.enums.vehiclewarn.VehicleWarnRangEnum;
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnRangMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnRang;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
@@ -19,8 +19,18 @@ public class VehicleWarnRangeDaoImpl extends BaseDaoImpl<VehicleWarnRangMapper,
         return list(lQrWrapper()
                         .eq(VehicleWarnRang::getWarnConfigId, warnConfigId)
                         .eq(VehicleWarnRang::getStatus, VehicleWarnRangEnum.Status.ENABLE.getCode())
-                        .ge(VehicleWarnRang::getWarnEndTime, LocalDateTime.now())
                         .orderByDesc(VehicleWarnRang::getId)
                 );
     }
+
+    @Override
+    public boolean updateDisable(VehicleWarnRang item) {
+        return update(lUdWrapper()
+                .eq(VehicleWarnRang::getWarnConfigId, item.getWarnConfigId())
+                .eq(VehicleWarnRang::getWarnRang, item.getWarnRang())
+                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), VehicleWarnRang::getOrderGoodsNo, item.getOrderGoodsNo())
+                .eq(StringUtils.isNotBlank(item.getChildNo()), VehicleWarnRang::getChildNo, item.getChildNo())
+                .set(VehicleWarnRang::getStatus, VehicleWarnRangEnum.Status.DISABLE.getCode())
+        );
+    }
 }

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

@@ -9,4 +9,5 @@ import java.util.List;
 public interface VehicleWarnRangeDao extends BaseDao<VehicleWarnRangMapper, VehicleWarnRang, Integer> {
     List<VehicleWarnRang> ListByWarnConfigId(Integer warnConfigId);
 
+    boolean updateDisable(VehicleWarnRang item);
 }

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

@@ -95,6 +95,10 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
         vehicleWarnRang.setStatus(endTime.isAfter(LocalDateTime.now())?
                 VehicleWarnRangEnum.Status.ENABLE.getCode(): VehicleWarnRangEnum.Status.DISABLE.getCode());
         vehicleWarnRang.setCreateBy(loginUserInfo.getUserName());
+
+        // 禁用旧数据
+        vehicleWarnRangeDao.updateDisable(vehicleWarnRang);
+        // 新增新数据
         vehicleWarnRangeDao.saveEntity(vehicleWarnRang);
     }