From 165640ccada379858b4e1769c6475fcc95324843 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 09:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 cbaddef..a7616b4 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
@@ -64,7 +64,7 @@
// 每一个小时执行一次
// @Scheduled(cron = "0 0 0 * * ?")
-// @Scheduled(fixedRate = 1500000000)
+ @Scheduled(fixedRate = 1500000000)
public void dayOfCreateInspection() {
try {
@@ -275,26 +275,26 @@
}
}
}
-
+ tLocationList = tLocationList.stream().distinct().collect(Collectors.toList());
// 抽取重复点位
Integer currentValue = detail.getCurrentValue();
if(currentValue != cycle){
// 周期天数加一
detail.setCurrentValue(currentValue + 1);
// 获取重复点位
- Set<TLocation> repeatLocation = redisCache.getCacheSet(detail.getId() + REPEAT_LOCATION);
+ Set<TLocation> repeatLocation = redisCache.getCacheSet(detail.getId() + ":" + sysUser.getUserId() + REPEAT_LOCATION);
if(!CollectionUtils.isEmpty(repeatLocation)){
List<TLocation> locations = randomSelection(new ArrayList<>(tLocationList), num3);
tLocationList.addAll(locations);
}
Set<TLocation> locationSet = new HashSet<>(tLocationList);
- redisCache.setCacheSet(detail.getId() + REPEAT_LOCATION, locationSet);
+ redisCache.setCacheSet(detail.getId() + ":" + sysUser.getUserId() + REPEAT_LOCATION, locationSet);
}else {
// 设置当前周期为0
detail.setCurrentValue(0);
// 将重复点位置空
- redisCache.deleteObject(detail.getId() + REPEAT_LOCATION);
+ redisCache.deleteObject(detail.getId() + ":" + sysUser.getUserId() + REPEAT_LOCATION);
// 将项目部权重置空
redisCache.deleteObject(detail.getId() + PROJECT_DEPT_WEIGHT);
// 将保洁员权重置空
--
Gitblit v1.7.1