无关风月
2025-07-03 8d0bd68856c69ccc2a76f54a96fdd498ce3327c7
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 {
@@ -75,6 +80,8 @@
    }
    public void createInspection(TTemplate template) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Date date = new Date();
        // 查询所有的模板详情
        List<TTemplateDetail> list = templateDetailService.list(Wrappers.lambdaQuery(TTemplateDetail.class)
                .eq(TTemplateDetail::getTemplateId, template.getId()));
@@ -116,9 +123,11 @@
            // 获取项目部列表
            List<TProjectDept> projectDeptList;
            if(CollectionUtils.isEmpty(projectDeptIds)){
                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class));
                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .ne(TProjectDept::getParentId,0));
            }else {
                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .ne(TProjectDept::getParentId,0)
                        .in(TProjectDept::getId, projectDeptIds));
                // 所过所有的项目部都被抽取了,则重新抽取,并且清空项目部权重
                if(CollectionUtils.isEmpty(projectDeptList)){
@@ -131,7 +140,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 +157,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 +169,9 @@
                    .in(TCleaner::getProjectId, areaIds));
            int cleanerSums = num1 * Integer.parseInt(count + "");
            // 获取每天需要抽取的保洁员数,向上取整
            if (cleanerSums <cycle){
                cleanerSums = cycle;
            }
            int dayCleanerCount = cleanerSums / cycle;
            // 获取保洁员权重
@@ -256,12 +269,16 @@
                    SysUser sysUser = sysUsers.get(0);
                    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);