From 9b4d232ad6669612fc79c4e63448ae1b64caaae0 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Tue, 15 Apr 2025 19:30:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QualityInspectionServiceImpl.java | 12 +++-- .../impl/SafetyViolationServiceImpl.java | 12 +++-- .../imgUpload/vo/dto/SafetyViolationDto.java | 9 ++-- .../bonus/imgTool/task/dao/ProPullDao.java | 9 ++++ .../bonus/imgTool/task/job/ProPullTask.java | 17 +++++++ .../resources/mappers/basic/ProPullMapper.xml | 45 +++++++++++++++++++ .../imgUpload/SafetyViolationMapper.xml | 10 ++++- 7 files changed, 103 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java index 2ba9e61..774681e 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.imgTool.system.vo.LoginUser; import com.bonus.imgTool.system.vo.dto.FileStorageDto; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import org.apache.poi.ss.usermodel.Workbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +30,8 @@ import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; @Service @@ -52,6 +52,12 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { @Override public List getList(SafetyViolationDto data) { + String roleLevel = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getRoleLevel).orElse("0"); + String proIds = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getProIds).orElse("-1"); + if(Objects.equals(roleLevel, Constants.ROLE_LEVEL)){ // 项目部级 + List proList = Arrays.stream(proIds.split(",")).map(String::trim).filter(s -> !s.isEmpty()).map(Long::valueOf).collect(Collectors.toList()); + data.setProIds(proList); + } return dao.getList(data); } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index dda0581..92e4a54 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -15,6 +15,7 @@ import com.bonus.imgTool.system.vo.dto.FileStorageDto; import com.bonus.imgTool.task.job.ProPullTask; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import org.apache.poi.ss.usermodel.Workbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +30,8 @@ import java.net.URLEncoder; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; @Service @@ -50,6 +50,12 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { @Override public List getList(SafetyViolationDto data) { + String roleLevel = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getRoleLevel).orElse("0"); + String proIds = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getProIds).orElse("-1"); + if(Objects.equals(roleLevel, Constants.ROLE_LEVEL)){ // 项目部级 + List proList = Arrays.stream(proIds.split(",")).map(String::trim).filter(s -> !s.isEmpty()).map(Long::valueOf).collect(Collectors.toList()); + data.setProIds(proList); + } return dao.getList(data); } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java index 44d9942..9f0a1e6 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java @@ -73,7 +73,7 @@ public class SafetyViolationDto extends PageEntity { */ private String rectDesc; /** - * 整改状态 0.待整改 1.已整改 + * 整改状态 0.待整改 1.已整改 2.未整改 */ private String rectStatus; /** @@ -120,12 +120,15 @@ public class SafetyViolationDto extends PageEntity { */ private List delFileList; - private String proStatus; - private String proType; private String uploadType; private String keyWord; + /** + * 用户管理的工程 + */ + private List proIds; + } diff --git a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java index 7cf3ac6..e90e558 100644 --- a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java +++ b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java @@ -1,6 +1,7 @@ package com.bonus.imgTool.task.dao; import com.bonus.imgTool.basic.vo.dto.ProDto; +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; import com.bonus.imgTool.system.vo.dto.FileStorageDto; import org.springframework.stereotype.Repository; @@ -20,4 +21,12 @@ public interface ProPullDao { List getNotHaveWatermarkPhoto(); void updateHaveWatermarkPhoto(List list); + + List getSafetyViolationData(); + + List getQualityInspectionData(); + + void updateSafetyViolationData(List safeList); + + void updateQualityInspectionData(List qualityList); } diff --git a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java index 9eb329d..930451c 100644 --- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java +++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java @@ -2,6 +2,7 @@ package com.bonus.imgTool.task.job; import cn.hutool.core.date.DateUtil; import com.bonus.imgTool.basic.vo.dto.ProDto; +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; import com.bonus.imgTool.system.vo.dto.FileStorageDto; import com.bonus.imgTool.task.dao.ProPullDao; import com.bonus.imgTool.utils.HighQualityWatermark; @@ -83,6 +84,22 @@ public class ProPullTask { log.info("--------水印照片生成定时器完毕------"); } + + /** + * 整改状态随时间流逝变化 + */ + @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 30) + @Async + public void updateRectStatusTask() { + log.info("--------整改状态随时间流逝变化定时器开启------"); + //实名制工程 + List safeList = dao.getSafetyViolationData(); + dao.updateSafetyViolationData(safeList); + List qualityList = dao.getQualityInspectionData(); + dao.updateQualityInspectionData(qualityList); + log.info("--------整改状态随时间流逝变化定时器完毕------"); + } + /** * 同步工程数据 * @param proList diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml index 7b4e9df..cb9847a 100644 --- a/src/main/resources/mappers/basic/ProPullMapper.xml +++ b/src/main/resources/mappers/basic/ProPullMapper.xml @@ -89,6 +89,30 @@ + + + + UPDATE + tb_safety_violations + SET + rect_status = #{item.rectStatus} + WHERE + id = #{item.id} + + + + + + + UPDATE + tb_quality_inspection + SET + rect_status = #{item.rectStatus} + WHERE + id = #{item.id} + + + + + + diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index e70615f..e75c04a 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -208,12 +208,18 @@ and tsv.gx_id = #{gxId} - - and tp.status = #{proStatus} + + and tsv.rect_status = #{rectStatus} and locate(#{keyWord},tsv.vio_place) + + and tsv.pro_id in + + #{proId} + + GROUP BY tsv.id