bug修改

xuhy

5 天以前 ac499486cf06e9e06834ed5c182f26267d871b9b

 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;
@@ -53,9 +55,13 @@
    private ISysUserService sysUserService;
    @Autowired
    private TTaskCleanService taskCleanService;
    @Autowired
    private TTemplateCountService templateCountService;


    @Scheduled(cron = "0 0 0 * * ?")
    // 每一个小时执行一次
//    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(fixedRate = 1500000000)
    public void dayOfCreateInspection() {
        try {

@@ -84,7 +90,7 @@
        // 通过模板id查询员工巡检员
        List<SysUser> sysUsers = sysUserService.selectUserByTempLateId(template.getId());
        // 创建任务
        list.forEach(detail -> {
        for (TTemplateDetail detail : list) {
            // 计算周期
            int cycle = detail.getCycle();
            switch (detail.getCycleType()){
@@ -111,18 +117,43 @@
            // 获取点位类型的占比
            String num4 = detail.getNum4();

            // 未绑定员工
            if(CollectionUtils.isEmpty(sysUsers)){
                continue;
            }



            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 +162,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());
@@ -146,17 +178,27 @@
            List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());

            // 拿到抽取的项目部下的所有保洁员
            List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                    .in(TProjectDept::getParentId, proIds));
//            List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
//                    .in(TProjectDept::getId, proIds));
            // 获取片区id
            List<String> areaIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
            List<String> areaIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(areaIds)){
                return;
            }

            // 计算每天需要抽取多少个保洁员
            long count = cleanerService.count(Wrappers.lambdaQuery(TCleaner.class)
                    .in(TCleaner::getProjectId, areaIds));
            int cleanerSums = num1 * Integer.parseInt(count + "");
            // 获取每天需要抽取的保洁员数,向上取整
            if (cleanerSums < cycle){
                cleanerSums = cycle;
            }
            int dayCleanerCount = cleanerSums / cycle;

            if((cycle == detail.getCurrentValue()) && cleanerSums % cycle != 0){
                dayCleanerCount++;
            }

            // 获取保洁员权重
            List<String> cleanerIds = redisCache.getCacheList(detail.getId() + CLEANER_WEIGHT);
@@ -186,7 +228,8 @@
                redisCache.deleteObject(detail.getId() + CLEANER_WEIGHT);
                List<TCleaner> tCleaners1 = randomSelection(cleaners1, dayCleanerCount - tCleaners.size());
                List<String> cleanIds1 = tCleaners1.stream().map(TCleaner::getId).collect(Collectors.toList());
                // 将已抽取的项目部id保存到redis中
                // 将已抽取的保洁员id保存到redis中
                cleanIds1.addAll(cleanIds);
                redisCache.setCacheList(detail.getId() + CLEANER_WEIGHT, cleanIds1);
                tCleaners.addAll(tCleaners1);
            }else {
@@ -199,8 +242,6 @@
            List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                    .in(TLocation::getLocationCleaner, cleanersIds));
            // 查询点位类型
//            List<TLocationType> locationTypes = locationTypeService.list(Wrappers.lambdaQuery(TLocationType.class)
//                    .orderByDesc(TLocationType::getCreateTime));
            JSONArray jsonArray = JSONObject.parseArray(num4);
            List<TLocation> tLocationList = new ArrayList<>();
            for (Object o : jsonArray) {
@@ -237,6 +278,10 @@
                detail.setCurrentValue(0);
                // 将重复点位置空
                redisCache.deleteObject(detail.getId() + REPEAT_LOCATION);
                // 将项目部权重置空
                redisCache.deleteObject(detail.getId() + PROJECT_DEPT_WEIGHT);
                // 将保洁员权重置空
                redisCache.deleteObject(detail.getId() + CLEANER_WEIGHT);
            }

            // 创建任务
@@ -249,21 +294,32 @@
                    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.getTemplateId());
                String nameAndCode = CodeGenerateUtils.generateVolumeSn();
                task.setTaskName(nameAndCode);
                task.setTaskCode(nameAndCode);
                tasks.add(task);
            }
            taskCleanService.saveBatch(tasks);
            templateDetailService.updateById(detail);
        });

            // 添加应生成任务数量
            TTemplateCount templateCount = new TTemplateCount();
            templateCount.setTemplateId(detail.getId());
            templateCount.setTaskCount(tLocationList.size()* cycle);
            templateCount.setUserId(sysUser.getUserId());
            templateCountService.save(templateCount);

            taskCleanService.saveBatch(tasks);
            template.setTaskCount(tasks.size());
            templateService.updateById(template);
            templateDetailService.updateById(detail);
        }
    }

    /**