From ed4bf502ffd1a57b35640a3b78f1f12741e4416f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 15 Apr 2025 18:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imageUpload/dto/CoordinatePhotoReqVo.java | 12 ++++++++++++ .../imageUpload/dto/ImportantMatterReqVo.java | 12 ++++++++++++ .../imageUpload/dto/SafetyMeasuresReqVo.java | 12 ++++++++++++ .../service/impl/CoordinatePhotoServiceImpl.java | 13 +++++++++++-- .../service/impl/ImportantMatterServiceImpl.java | 13 +++++++++++-- .../service/impl/SafetyMeasuresServiceImpl.java | 13 +++++++++++-- .../mappers/imageUpload/CoordinatePhotoMapper.xml | 6 ++++++ .../mappers/imageUpload/ImportantMatterMapper.xml | 6 ++++++ .../mappers/imageUpload/SafetMeasuresMapper.xml | 6 ++++++ 9 files changed, 87 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java index 6254072..e815f7a 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java @@ -2,6 +2,8 @@ package com.bonus.imgTool.imageUpload.dto; import lombok.Data; +import java.util.List; + @Data public class CoordinatePhotoReqVo { @@ -30,6 +32,16 @@ public class CoordinatePhotoReqVo { */ private String keyWord; + /** + * 角色级别 0.项目部 1.分公司 + */ + private String roleLevel; + + /** + * 用户管理的工程 + */ + private List proIds; + private int page; private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java index b88c7e7..be9c588 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java @@ -3,6 +3,8 @@ package com.bonus.imgTool.imageUpload.dto; import lombok.Data; +import java.util.List; + @Data public class ImportantMatterReqVo { @@ -31,6 +33,16 @@ public class ImportantMatterReqVo { */ private String keyWord; + /** + * 角色级别 0.项目部 1.分公司 + */ + private String roleLevel; + + /** + * 用户管理的工程 + */ + private List proIds; + private int page; private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java index 69f5533..b12c927 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java @@ -2,6 +2,8 @@ package com.bonus.imgTool.imageUpload.dto; import lombok.Data; +import java.util.List; + @Data public class SafetyMeasuresReqVo { @@ -30,6 +32,16 @@ public class SafetyMeasuresReqVo { */ private String keyWord; + /** + * 角色级别 0.项目部 1.分公司 + */ + private String roleLevel; + + /** + * 用户管理的工程 + */ + private List proIds; + private int page; private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index 729edf5..6f5d47a 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -8,9 +8,11 @@ import com.bonus.imgTool.imageUpload.dto.CoordinatePhotoVo; import com.bonus.imgTool.imageUpload.mapper.CoordinatePhotoMapper; import com.bonus.imgTool.imageUpload.service.CoordinatePhotoService; import com.bonus.imgTool.system.service.SysFileResourceService; +import com.bonus.imgTool.system.vo.LoginUser; import com.bonus.imgTool.system.vo.SysFileResourceVo; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -20,8 +22,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -46,6 +48,13 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { public ServerResponse getCoordinatePhotoList(CoordinatePhotoReqVo data) { PageHelper.startPage(data.getPage(), data.getLimit()); try { + 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); + } + data.setRoleLevel(roleLevel); List list = coordinatePhotoMapper.getCoordinatePhotoList(data); //获取图片信息 for (CoordinatePhotoVo coordinatePhotoVo : list) { diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index b1fd87d..db4b65f 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -7,9 +7,11 @@ import com.bonus.imgTool.imageUpload.dto.ImportantMatterVo; import com.bonus.imgTool.imageUpload.mapper.ImportantMatterMapper; import com.bonus.imgTool.imageUpload.service.ImportantMatterService; import com.bonus.imgTool.system.service.SysFileResourceService; +import com.bonus.imgTool.system.vo.LoginUser; import com.bonus.imgTool.system.vo.SysFileResourceVo; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -21,8 +23,8 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -46,6 +48,13 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { public ServerResponse getImportantMatterList(ImportantMatterReqVo data) { PageHelper.startPage(data.getPage(), data.getLimit()); try { + 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); + } + data.setRoleLevel(roleLevel); List list = importantMatterMapper.getImportantMatterList(data); //获取图片信息 for (ImportantMatterVo importantMatterVo : list) { diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index 96ad57c..534b28e 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -8,9 +8,11 @@ import com.bonus.imgTool.imageUpload.dto.SafetyMeasuresVo; import com.bonus.imgTool.imageUpload.mapper.SafetyMeasuresMapper; import com.bonus.imgTool.imageUpload.service.SafetyMeasuresService; import com.bonus.imgTool.system.service.SysFileResourceService; +import com.bonus.imgTool.system.vo.LoginUser; import com.bonus.imgTool.system.vo.SysFileResourceVo; import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -21,8 +23,8 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -46,6 +48,13 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { public ServerResponse getSafetyMeasuresList(SafetyMeasuresReqVo data) { PageHelper.startPage(data.getPage(), data.getLimit()); try { + 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); + } + data.setRoleLevel(roleLevel); List list = safetyMeasuresMapper.getSafetyMeasuresList(data); //获取图片信息 for (SafetyMeasuresVo safetyMeasuresVo : list) { diff --git a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml index f5c0eb3..22be763 100644 --- a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml +++ b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml @@ -66,6 +66,12 @@ create_time as createTime, create_user_name as createUserName from tb_coordinate_photo where is_active = '1' and pro_id = #{proId} + + AND pro_id IN + + #{proId} + + and major_id = #{majorId} and gx_id = #{gxId} diff --git a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml index 121e25d..064e9b3 100644 --- a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml +++ b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml @@ -65,6 +65,12 @@ from tb_main_matter_publicize_photo where is_active = '1' and pro_id = #{proId} + + AND pro_id IN + + #{proId} + + and major_id = #{majorId} and gx_id = #{gxId} diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml index 85105a3..d0fdf7e 100644 --- a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -66,6 +66,12 @@ create_time as createTime, create_user_name as createUserName from tb_safety_measure where is_active = '1' and pro_id = #{proId} + + AND pro_id IN + + #{proId} + + and major_id = #{majorId} and gx_id = #{gxId}