Merge remote-tracking branch 'origin/master'

无关风月

20 小时以前 a858d0f96cd50b7587cd0ac7291e0432e48ac759

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -9,6 +9,7 @@
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -31,9 +32,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import oshi.driver.mac.net.NetStat;

import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
@@ -61,6 +64,8 @@
    private TNoticeService noticeService;
    @Resource
    private TNoticeSetService noticeSetService;
    @Resource
    private TEarlyWarningService earlyWarningService;
    @Resource
    private TTaskDetailService taskDetailService;

@@ -91,18 +96,30 @@
        List<SysUser> sysUsers = sysUserService.selectAllList();
        List<TLocation> locationList = locationService.list();
        if (StringUtils.hasLength(query.getDeptName())){
            List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
            List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
            List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
                    .stream().map(TProjectDept::getId).collect(Collectors.toList());
            for (TProjectDept tProjectDept : list) {
                if (tProjectDept.getParentId().equals("0")){
                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                                .stream().map(TProjectDept::getId).collect(Collectors.toList());
                        listIds.addAll(collect);
                    listIds.add(tProjectDept.getId());
                }
            }
            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
                    .stream().map(TDept::getId).collect(Collectors.toList());
            projectIds.addAll(deptIds);
            if (projectIds.isEmpty()){
            listIds.addAll(deptIds);
            if (listIds.isEmpty()){
                return R.ok(new PageInfo<>());
            }
            List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
                    .map(SysUser::getUserId).collect(Collectors.toList());
            query.setPatrolInspectorIds( collect);
            if (StringUtils.hasLength(query.getPhonenumber())){
                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                        sysUser.getPhonenumber().contains(query.getPhonenumber())
                                && projectIds.contains(sysUser.getDeptId())
                                && listIds.contains(sysUser.getDeptId())
                ).map(SysUser::getUserId).collect(Collectors.toList());
                if (patrolInspectorIds.isEmpty()){
                    return R.ok(new PageInfo<>());
@@ -161,6 +178,9 @@
    @ApiOperation(value = "新增任务")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody TTaskDTO dto) {
        String nameAndCode = CodeGenerateUtils.generateVolumeSn();
        dto.setTaskName(nameAndCode);
        dto.setTaskCode(nameAndCode);
        dto.setTaskType(2);
        String implementTime1 = dto.getImplementTime1();
        // 转化为LocalDateTime类型
@@ -176,6 +196,10 @@
    public R<Boolean> audit(@RequestBody  TTaskAuditDTO dto) {
        dto.setAuditTime(LocalDateTime.now());
        TTask task = taskCleanerService.getById(dto.getTaskId());
        TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
                .eq(TTaskDetail::getHandleType,1)
                .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
        dto.setClearStatus(one.getClearStatus());
        TLocation location = locationService.getById(task.getLocationId());
        TNotice tNotice = new TNotice();
        TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
@@ -185,6 +209,21 @@
        tNotice.setDataId(task.getId());
        tNotice.setNoticeSetType(noticeSet.getNoticeType());
        if (dto.getAuditStatus()==2){
            if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
                if (location.getUnqualifiedTaskId().split(",").length==2){
                    // 已经两条不合格了 生成点位不合格预警记录
                    location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
                    TEarlyWarning tEarlyWarning = new TEarlyWarning();
                    tEarlyWarning.setWarningType(2);
                    tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
                    earlyWarningService.save(tEarlyWarning);
                    location.setUnqualifiedTaskId("");
                    locationService.updateById(location);
                }
            }else{
                location.setUnqualifiedTaskId(dto.getTaskId());
                locationService.updateById(location);
            }
            dto.setHandleType(3);
            // 将任务修改为待整改
            task.setStatus(4);
@@ -192,50 +231,55 @@
            // 增加消息
            tNotice.setNoticeType(1);
            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");

        }else{
            if (dto.getClearStatus()==2){
                if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
                    if (location.getUnqualifiedTaskId().split(",").length==2){
                        // 已经两条不合格了 生成点位不合格预警记录
                        location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
                        TEarlyWarning tEarlyWarning = new TEarlyWarning();
                        tEarlyWarning.setWarningType(2);
                        tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
                        earlyWarningService.save(tEarlyWarning);
                        location.setUnqualifiedTaskId("");
                        locationService.updateById(location);
                    }
                }else{
                    location.setUnqualifiedTaskId(dto.getTaskId());
                    locationService.updateById(location);
                }
            }
            dto.setHandleType(2);
            // 如果是初次审核就通过 将状态设置为已完成
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (list.isEmpty()){
                if (dto.getClearStatus()==1){
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery()
                    .eq(TTaskDetail::getHandleType,1)
                    .eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
                if (list.size()<2){
                    task.setStatus(6);
                    taskCleanerService.updateById(task);
                }else{
                    task.setStatus(4);
                    taskCleanerService.updateById(task);
// 增加消息
                    tNotice.setNoticeType(1);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
                }

            }else{
                if (dto.getClearStatus()==1){
                    task.setStatus(5);
                    taskCleanerService.updateById(task);
                    // 增加消息
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }else{
                    task.setStatus(4);
                    task.setStatus(5);
                    taskCleanerService.updateById(task);
                    // 增加消息
                    tNotice.setNoticeType(1);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }

            }

        }
        noticeService.save(tNotice);
        dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
        taskDetailService.save(dto);
        one.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
        one.setAuditTime(LocalDateTime.now());
        one.setAuditRemark(dto.getAuditRemark());
        one.setAuditStatus(dto.getAuditStatus());
        taskDetailService.updateById(one);
        return R.ok();
    }
    @Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "批量审核任务")
    @PostMapping(value = "/auditBatch")
    public R<Boolean> auditBatch(@RequestBody @Validated TTaskAuditBatchDTO dto) {
    public R<Boolean> auditBatch(@RequestBody  TTaskAuditBatchDTO dto) {
        List<TTaskDetail> tTaskDetails = new ArrayList<>();
        for (String s : dto.getTaskIds().split(",")) {
            TTask byId = taskCleanerService.getById(s);
@@ -277,13 +321,17 @@
        TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
        taskDetailVO.setLocationAddress(byId1.getLocationAddress());
        taskDetailVO.setLocationIcon(byId2.getLocationIcon());
        taskDetailVO.setLocationName(byId2.getLocationName());
        taskDetailVO.setLocationName(byId1.getLocationName());
        taskDetailVO.setLocationTypeName(byId2.getLocationName());
        TTaskDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);
        if (tTaskDetail!=null &&  tTaskDetail.getUnqualified()!=null){
            TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());
            if (byId3!=null){
                tTaskDetail.setUnqualifiedName(byId3.getDataContent());
            }
        }
        if (tTaskDetail!=null){
            tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
        }
        taskDetailVO.setTaskDetail(tTaskDetail);
        taskDetailVO.setRecords(list);
@@ -340,9 +388,11 @@
                byId4.setUnqualifiedName(byId3.getDataContent());
            }
        }
        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
        if (sysUser!=null){
            byId4.setAuditPersonName(sysUser.getUserName());
        if (byId4.getAuditPerson()!=null){
            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
            if (sysUser!=null){
                byId4.setAuditPersonName(sysUser.getUserName());
            }
        }
        taskDetailVO.setTaskDetail(byId4);
        return R.ok(taskDetailVO);
@@ -356,73 +406,89 @@
        return R.ok();
    }

    @Log(title = "任务记录导出", businessType = BusinessType.EXPORT)
    @Log(title = "任务记录导出", businessType = BusinessType.OTHER)
    @ApiOperation(value = "任务记录导出")
    @PostMapping(value = "/exportExcel")
    public void exportExcel(@RequestBody TaskListQuery query) {
        List<SysUser> sysUsers = sysUserService.selectAllList();
        List<TLocation> locationList = locationService.list();
        if (StringUtils.hasLength(query.getDeptName())){
            List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
                    .stream().map(TProjectDept::getId).collect(Collectors.toList());
            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
                    .stream().map(TDept::getId).collect(Collectors.toList());
            projectIds.addAll(deptIds);
            if (projectIds.isEmpty()){
                projectIds.add("-1");
        if(CollectionUtils.isEmpty(query.getTaskIds())){

            if (StringUtils.hasLength(query.getDeptName())){
                List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
                List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
                        .stream().map(TProjectDept::getId).collect(Collectors.toList());
                for (TProjectDept tProjectDept : list) {
                    if (tProjectDept.getParentId().equals("0")){
                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                                .stream().map(TProjectDept::getId).collect(Collectors.toList());
                        listIds.addAll(collect);
                    }
                }
                List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
                        .stream().map(TDept::getId).collect(Collectors.toList());
                listIds.addAll(deptIds);
                if (listIds.isEmpty()){
                    listIds.add("0");
                }
                List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
                        .map(SysUser::getUserId).collect(Collectors.toList());
                query.setPatrolInspectorIds( collect);
                if (StringUtils.hasLength(query.getPhonenumber())){
                    List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                            sysUser.getPhonenumber().contains(query.getPhonenumber())
                                    && listIds.contains(sysUser.getDeptId())
                    ).map(SysUser::getUserId).collect(Collectors.toList());
                    if (patrolInspectorIds.isEmpty()){
                        patrolInspectorIds.add(0L);
                    }
                    query.setPatrolInspectorIds(patrolInspectorIds);
                }
            }
            if (StringUtils.hasLength(query.getPhonenumber())){
                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                        sysUser.getPhonenumber().equals(query.getPhonenumber())
                                && projectIds.contains(sysUser.getDeptId())
                        sysUser.getPhonenumber().contains(query.getPhonenumber())
                ).map(SysUser::getUserId).collect(Collectors.toList());
                if (patrolInspectorIds.isEmpty()){
                    patrolInspectorIds.add(-1L);
                query.setPatrolInspectorIds(patrolInspectorIds);
                if (!query.getPatrolInspectorIds().isEmpty()){
                    // 取交集
                    patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
                }
                query.setPatrolInspectorIds(patrolInspectorIds);
                if (patrolInspectorIds.isEmpty()){
                    patrolInspectorIds.add(0L);
                }
            }
        }
        if (StringUtils.hasLength(query.getPhonenumber())){
            List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                    sysUser.getPhonenumber().equals(query.getPhonenumber())
            ).map(SysUser::getUserId).collect(Collectors.toList());
            if (!query.getPatrolInspectorIds().isEmpty()){
                // 取交集
                patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
            }
            query.setPatrolInspectorIds(patrolInspectorIds);
            if (patrolInspectorIds.isEmpty()){
                patrolInspectorIds.add(-1L);
            }
        }
        if (query.getClearStatus()!=null){
            List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
                    .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
            query.setTaskIds(collect);
            if (collect.isEmpty()){
                collect.add("-1");
            }
        }
        if (query.getLocationType()!=null){
            List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
                    .collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add("-1");
            }
            query.setLocationIds(collect);
        }
        if (StringUtils.hasLength(query.getLocationName())){
            List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
                    .collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add("-1");
            }else{
                collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
            if (query.getClearStatus()!=null){
                List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
                        .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
                query.setTaskIds(collect);
                if (collect.isEmpty()){
                    collect.add("-1");
                    collect.add("0");
                }
            }
            if (StringUtils.hasLength(query.getLocationType())){
                List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
                        .collect(Collectors.toList());
                if (collect.isEmpty()){
                    collect.add("0");
                }
                query.setLocationIds(collect);
            }
            if (StringUtils.hasLength(query.getLocationName())){
                List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
                        .collect(Collectors.toList());
                query.setLocationIds(collect);
                if (collect.isEmpty()){
                    collect.add("0");
                }else{
                    collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
                    if (collect.isEmpty()){
                        collect.add("0");
                    }
                    query.setLocationIds(collect);
                }
            }
        }
        List<TaskListVO> list = taskCleanerService.exportList(query);