From 083c414ff683ab12e65069c6c0ba6871ed1ed09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:09 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index 74ac94b..de1f249 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -60,11 +60,13 @@
private TTaskCleanService taskCleanService;
@Autowired
private TTemplateCountService templateCountService;
+ @Autowired
+ private TEarlyWarningService earlyWarningService;
// 每一个小时执行一次
// @Scheduled(cron = "0 0 0 * * ?")
- @Scheduled(fixedRate = 1500000000)
+// @Scheduled(fixedRate = 1500000000)
public void dayOfCreateInspection() {
try {
@@ -92,6 +94,38 @@
} catch (Exception e) {
e.printStackTrace();
}
+ }
+
+ @Scheduled(cron = "0 0 20 * * ?")
+ public void dayOfEarlyWarning() {
+ try {
+ // 查询前一天为执行的所有任务，改成已超时状态
+ List<TTask> taskCleanList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
+ .like(TTask::getImplementTime, LocalDate.now().minusDays(1))
+ .eq(TTask::getStatus, 1));
+ if (!CollectionUtils.isEmpty(taskCleanList)) {
+ List<TEarlyWarning> earlyWarningList = new ArrayList<>();
+ taskCleanList.forEach(task -> {
+ task.setStatus(2);
+ TEarlyWarning earlyWarning = new TEarlyWarning();
+ earlyWarning.setWarningType(1);
+ earlyWarning.setTaskId(task.getId());
+ earlyWarningList.add(earlyWarning);
+ });
+ earlyWarningService.saveBatch(earlyWarningList);
+ taskCleanService.updateBatchById(taskCleanList);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 生成点位预警
+ */
+ // 每分钟执行一次
+ public void earning() {
+
}
public void createInspection(TTemplate template) {
@@ -325,13 +359,16 @@
tasks.add(task);
}
- // 添加应生成任务数量
- TTemplateCount templateCount = new TTemplateCount();
- templateCount.setTemplateId(detail.getTemplateId());
- templateCount.setTaskCount(tLocationList.size()* cycle);
- templateCount.setUserId(sysUser.getUserId());
- templateCountService.save(templateCount);
-
+ // 添加应生成任务数量
+ TTemplateCount templateCount = new TTemplateCount();
+ templateCount.setTemplateId(detail.getTemplateId());
+ // 查询所有的保洁员下面的点位
+ List<String> cleanIds = cleaners.stream().map(TCleaner::getId).collect(Collectors.toList());
+ List<TLocation> tLocations = locationService.list(Wrappers.lambdaQuery(TLocation.class)
+ .in(TLocation::getLocationCleaner, cleanIds));
+ templateCount.setTaskCount(tLocations.size());
+ templateCount.setUserId(sysUser.getUserId());
+ templateCountService.save(templateCount);
taskCleanService.saveBatch(tasks);
taskCount = taskCount + tasks.size();
}
--
Gitblit v1.7.1