fix: 定时任务bug修复

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/ConferenceJob.java

@@ -8,6 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -29,13 +30,14 @@ public class ConferenceJob {
         // 获取时间范围
         Date current = DateUtil.now();
         Date before = DateUtil.minusDays(current, 1);
-        String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
+        String today = DateUtil.format(current, DateUtil.PATTERN_DATE);
-        String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
+        String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE);
         // 查询前一天的超时未完成会议计划
         List<ConferencePlanEntity> list = conferencePlanService.getWaitingConferencePlanInTimeRange(yesterday, today);
-        list.forEach(x -> {
+        if (CollectionUtils.isEmpty(list)) {
-            x.setConferenceStatus(ConferenceStatusEnum.UNFINISHED.getValue());
+            return ReturnT.SUCCESS;
-        });
+        }
+        list.forEach(x -> x.setConferenceStatus(ConferenceStatusEnum.UNFINISHED.getValue()));
         // 将状态置为未完成
         boolean flag = conferencePlanService.updateBatchById(list);
         return flag ? ReturnT.SUCCESS : ReturnT.FAIL;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java

@@ -8,6 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -29,10 +30,13 @@ public class DeviceJob {
         // 获取时间范围
         Date current = DateUtil.now();
         Date before = DateUtil.minusDays(current, 1);
-        String today = DateUtil.format(current, "yyyy-mm-dd");
+        String today = DateUtil.format(current, DateUtil.PATTERN_DATE);
-        String yesterday = DateUtil.format(before, "yyyy-mm-dd");
+        String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE);
         // 查询昨天的过期设备
         List<DeviceEntity> list = deviceService.getExpiredDeviceByTime(yesterday, today);
+        if (CollectionUtils.isEmpty(list)) {
+            return ReturnT.SUCCESS;
+        }
         list.forEach(e -> e.setDeviceStatus(DeviceStatusEnum.EXPIRED.getValue()));
         // 更新状态
         boolean update = deviceService.updateBatchById(list);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/HygieneJob.java

@@ -8,6 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -29,13 +30,14 @@ public class HygieneJob {
         // 获取时间范围
         Date current = DateUtil.now();
         Date before = DateUtil.minusDays(current, 1);
-        String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
+        String today = DateUtil.format(current, DateUtil.PATTERN_DATE);
-        String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
+        String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE);
         // 查询前一天的超时未完成卫生自查计划
         List<HygienePlanEntity> list = hygienePlanService.getWaitingHygienePlanInTimeRange(yesterday, today);
-        list.forEach(x -> {
+        if (CollectionUtils.isEmpty(list)) {
-            x.setHygienePlanStatus(TrainStatusEnum.UNFINISHED.getValue());
+            return ReturnT.SUCCESS;
-        });
+        }
+        list.forEach(x -> x.setHygienePlanStatus(TrainStatusEnum.UNFINISHED.getValue()));
         // 将状态置为未完成
         boolean flag = hygienePlanService.updateBatchById(list);
         return flag ? ReturnT.SUCCESS : ReturnT.FAIL;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java

@@ -8,6 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -29,13 +30,14 @@ public class RehearsalJob {
         // 获取时间范围
         Date current = DateUtil.now();
         Date before = DateUtil.minusDays(current, 1);
-        String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
+        String today = DateUtil.format(current, DateUtil.PATTERN_DATE);
-        String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
+        String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE);
         // 查询前一天的超时未完成演练计划
         List<RehearsalPlanEntity> list = rehearsalPlanService.getWaitingRehearsalInTimeRange(yesterday, today);
-        list.forEach(x -> {
+        if (CollectionUtils.isEmpty(list)) {
-            x.setRehearsalStatus(RehearsalStatusEnum.UNFINISHED.getValue());
+            return ReturnT.SUCCESS;
-        });
+        }
+        list.forEach(x -> x.setRehearsalStatus(RehearsalStatusEnum.UNFINISHED.getValue()));
         // 将状态置为未完成
         boolean flag = rehearsalPlanService.updateBatchById(list);
         return flag ? ReturnT.SUCCESS : ReturnT.FAIL;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java

@@ -8,6 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -29,13 +30,14 @@ public class TrainJob {
         // 获取时间范围
         Date current = DateUtil.now();
         Date before = DateUtil.minusDays(current, 1);
-        String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
+        String today = DateUtil.format(current, DateUtil.PATTERN_DATE);
-        String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
+        String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE);
         // 查询前一天的超时未完成培训计划
         List<TrainPlanEntity> list = trainPlanService.getWaitingTrainPlanInTimeRange(yesterday, today);
-        list.forEach(x -> {
+        if (CollectionUtils.isEmpty(list)) {
-            x.setTrainStatus(TrainStatusEnum.UNFINISHED.getValue());
+            return ReturnT.SUCCESS;
-        });
+        }
+        list.forEach(x -> x.setTrainStatus(TrainStatusEnum.UNFINISHED.getValue()));
         // 将状态置为未完成
         boolean flag = trainPlanService.updateBatchById(list);
         return flag ? ReturnT.SUCCESS : ReturnT.FAIL;