From 10aa235faf1bb085b4f0103291887ba302030c0e Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 17 Jan 2024 11:09:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/safeproduct/jobs/ConferenceJob.java | 12 +++++++----- .../main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java | 8 ++++++-- .../java/com/hnac/hzims/safeproduct/jobs/HygieneJob.java | 12 +++++++----- .../java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java | 12 +++++++----- .../main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java | 12 +++++++----- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/ConferenceJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/ConferenceJob.java index 26e40c5..45a7b7f 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/ConferenceJob.java +++ b/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 yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss"); + String today = DateUtil.format(current, DateUtil.PATTERN_DATE); + String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE); // 查询前一天的超时未完成会议计划 List list = conferencePlanService.getWaitingConferencePlanInTimeRange(yesterday, today); - list.forEach(x -> { - x.setConferenceStatus(ConferenceStatusEnum.UNFINISHED.getValue()); - }); + if (CollectionUtils.isEmpty(list)) { + return ReturnT.SUCCESS; + } + list.forEach(x -> x.setConferenceStatus(ConferenceStatusEnum.UNFINISHED.getValue())); // 将状态置为未完成 boolean flag = conferencePlanService.updateBatchById(list); return flag ? ReturnT.SUCCESS : ReturnT.FAIL; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java index dd7a622..2e5c414 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java +++ b/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 yesterday = DateUtil.format(before, "yyyy-mm-dd"); + String today = DateUtil.format(current, DateUtil.PATTERN_DATE); + String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE); // 查询昨天的过期设备 List 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); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/HygieneJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/HygieneJob.java index 4a8aabf..399aa1d 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/HygieneJob.java +++ b/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 yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss"); + String today = DateUtil.format(current, DateUtil.PATTERN_DATE); + String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE); // 查询前一天的超时未完成卫生自查计划 List list = hygienePlanService.getWaitingHygienePlanInTimeRange(yesterday, today); - list.forEach(x -> { - x.setHygienePlanStatus(TrainStatusEnum.UNFINISHED.getValue()); - }); + if (CollectionUtils.isEmpty(list)) { + return ReturnT.SUCCESS; + } + list.forEach(x -> x.setHygienePlanStatus(TrainStatusEnum.UNFINISHED.getValue())); // 将状态置为未完成 boolean flag = hygienePlanService.updateBatchById(list); return flag ? ReturnT.SUCCESS : ReturnT.FAIL; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java index d6eda46..2cb8450 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java +++ b/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 yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss"); + String today = DateUtil.format(current, DateUtil.PATTERN_DATE); + String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE); // 查询前一天的超时未完成演练计划 List list = rehearsalPlanService.getWaitingRehearsalInTimeRange(yesterday, today); - list.forEach(x -> { - x.setRehearsalStatus(RehearsalStatusEnum.UNFINISHED.getValue()); - }); + if (CollectionUtils.isEmpty(list)) { + return ReturnT.SUCCESS; + } + list.forEach(x -> x.setRehearsalStatus(RehearsalStatusEnum.UNFINISHED.getValue())); // 将状态置为未完成 boolean flag = rehearsalPlanService.updateBatchById(list); return flag ? ReturnT.SUCCESS : ReturnT.FAIL; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java index 6ed0f71..415fd72 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java +++ b/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 yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss"); + String today = DateUtil.format(current, DateUtil.PATTERN_DATE); + String yesterday = DateUtil.format(before, DateUtil.PATTERN_DATE); // 查询前一天的超时未完成培训计划 List list = trainPlanService.getWaitingTrainPlanInTimeRange(yesterday, today); - list.forEach(x -> { - x.setTrainStatus(TrainStatusEnum.UNFINISHED.getValue()); - }); + if (CollectionUtils.isEmpty(list)) { + return ReturnT.SUCCESS; + } + list.forEach(x -> x.setTrainStatus(TrainStatusEnum.UNFINISHED.getValue())); // 将状态置为未完成 boolean flag = trainPlanService.updateBatchById(list); return flag ? ReturnT.SUCCESS : ReturnT.FAIL;