From ea92d5864732ac8833bb7bbb50819ec3feec0c24 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 17:40:00 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 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 8091cdf..70c6d87 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.system.mapper.TCleanerMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
@@ -17,6 +18,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -55,7 +57,10 @@
private TTaskCleanService taskCleanService;
- @Scheduled(cron = "0 0 0 * * ?")
+ // 每一个小时执行一次
+// @Scheduled(cron = "0 0 0 * * ?")
+ @Scheduled(fixedRate = 1500000000)
+
public void dayOfCreateInspection() {
try {
@@ -111,18 +116,36 @@
// 获取点位类型的占比
String num4 = detail.getNum4();
+ SysUser sysUser = sysUsers.get(0);
+ List<TProjectDept> projectDeptLists = new ArrayList<>();
+ if(sysUser.getDeptType() == 1){
+ TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
+ if("0".equals(projectDept.getParentId())){
+ projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ }else {
+ projectDeptLists.add(projectDept);
+ }
+ }else {
+ projectDeptLists = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .ne(TProjectDept::getParentId,0));
+ }
+ List<String> proDeptIds = projectDeptLists.stream().map(TProjectDept::getId).collect(Collectors.toList());
+
// 获取项目部在该模板详情中的权重
List<String> projectDeptIds = redisCache.getCacheList(detail.getId() + PROJECT_DEPT_WEIGHT);
// 获取项目部列表
List<TProjectDept> projectDeptList;
if(CollectionUtils.isEmpty(projectDeptIds)){
- projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class));
+ projectDeptList = projectDeptLists;
}else {
projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
- .in(TProjectDept::getId, projectDeptIds));
+ .ne(TProjectDept::getParentId,0)
+ .in(TProjectDept::getId, proDeptIds)
+ .notIn(TProjectDept::getId, projectDeptIds));
// 所过所有的项目部都被抽取了，则重新抽取，并且清空项目部权重
if(CollectionUtils.isEmpty(projectDeptList)){
- projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class));
+ projectDeptList = projectDeptLists;
redisCache.deleteObject(detail.getId() + PROJECT_DEPT_WEIGHT);
}
}
@@ -131,7 +154,8 @@
if(projectDepts.size() < num2){
List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
List<TProjectDept> projectDeptList1 = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
- .notIn(TProjectDept::getId, proIds));
+ .notIn(TProjectDept::getId, proIds)
+ .ne(TProjectDept::getParentId,0));
redisCache.deleteObject(detail.getId() + PROJECT_DEPT_WEIGHT);
List<TProjectDept> projectDepts1 = randomSelection(projectDeptList1, num2 - projectDepts.size());
List<String> proIds1 = projectDepts1.stream().map(TProjectDept::getId).collect(Collectors.toList());
@@ -147,7 +171,7 @@
// 拿到抽取的项目部下的所有保洁员
List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
- .in(TProjectDept::getParentId, proIds));
+ .in(TProjectDept::getId, proIds));
// 获取片区id
List<String> areaIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(areaIds)){
@@ -159,6 +183,9 @@
.in(TCleaner::getProjectId, areaIds));
int cleanerSums = num1 * Integer.parseInt(count + "");
// 获取每天需要抽取的保洁员数,向上取整
+ if (cleanerSums <cycle){
+ cleanerSums = cycle;
+ }
int dayCleanerCount = cleanerSums / cycle;
// 获取保洁员权重
@@ -252,18 +279,22 @@
task.setCleanerId(tCleaner.getId());
});
// 获取巡检员
- if(!CollectionUtils.isEmpty(sysUsers)){
- SysUser sysUser = sysUsers.get(0);
- task.setPatrolInspector(sysUser.getUserId().toString());
- task.setPatrolInspectorDept(sysUser.getDeptId());
- }
+ task.setPatrolInspector(sysUser.getUserId().toString());
+ task.setPatrolInspectorDept(sysUser.getDeptId());
+ task.setUserId(sysUser.getUserId());
task.setStatus(1);
task.setLocationId(tLocation.getId());
task.setImplementTime(LocalDateTime.now().plusDays(1));
task.setTaskType(1);
+ task.setTemplateId(detail.getId());
+ String nameAndCode = CodeGenerateUtils.generateVolumeSn();
+ task.setTaskName(nameAndCode);
+ task.setTaskCode(nameAndCode);
tasks.add(task);
}
taskCleanService.saveBatch(tasks);
+ template.setTaskCount(tasks.size());
+ templateService.updateById(template);
templateDetailService.updateById(detail);
});
--
Gitblit v1.7.1