From c7dce89d366c7e4a6621236b2f0275098c862443 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 23 Dec 2025 14:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=9A=84=E6=A6=82=E5=BF=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csharmonic/param/CsConfigurationParm.java |  2 +
 .../csharmonic/pojo/vo/CsConfigurationVO.java |  2 +
 .../mapper/mapping/CsConfigurationMapper.xml  | 11 ++-
 .../impl/CsConfigurationServiceImpl.java      | 68 +++++++++----------
 4 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java
index 3de45f4..2098cb8 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java
@@ -62,6 +62,8 @@ public class CsConfigurationParm  {
         private String id;
         @ApiModelProperty(value = "当前用户ID")
         private String currentUserId;
+        @ApiModelProperty(value = "当前用户角色")
+        private String roleCode;
 
     }
 
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java
index 625940b..4ba98ae 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java
@@ -31,6 +31,8 @@ public class CsConfigurationVO extends BaseEntity {
 
     private Integer orderBy;
 
+    private Integer scope;
+
 
     private List<String> projectIds;
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
index 66bed94..4b8b93e 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
@@ -7,14 +7,15 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="scope" jdbcType="INTEGER" property="scope" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, `name`, `status`, create_by, create_time, update_by, update_time
+      <!--@mbg.generated-->
+      id, `name`, `status`, `scope`,create_by, create_time, update_by, update_time
   </sql>
 
   <select id="queryPage" resultMap="BaseResultMap">
@@ -24,7 +25,11 @@
     <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
       #{item}
     </foreach>
-    AND (a.scope = 1 OR (a.scope = 0 AND a.create_by = #{userId}))
+    AND (a.scope = 1
+    <if test="userId != null and userId != ''">
+      OR (a.scope = 0 AND a.create_by = #{userId})
+    </if>
+    )
     <if test="temp!=null and temp.searchValue != null and temp.searchValue !=''">
       AND a.name  like concat(concat("%",#{temp.searchValue}),"%")
     </if>
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
index 84cf723..b72b0b8 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
@@ -33,7 +33,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 
+ *
  * Description:
  * Date: 2023/5/31  10:53【需求编号】
  *
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMapper, CsConfigurationPO> implements CsConfigurationService{
+public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMapper, CsConfigurationPO> implements CsConfigurationService {
     private final FileStorageUtil fileStorageUtil;
 
     private final UserFeignClient userFeignClient;
@@ -53,17 +53,16 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
     public boolean add(CsConfigurationParm csConfigurationParm) {
         CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
 
-        BeanUtils.copyProperties(csConfigurationParm,csConfigurationPO);
+        BeanUtils.copyProperties(csConfigurationParm, csConfigurationPO);
 
         List<String> projectIds = csConfigurationParm.getProjectIds();
-        if(CollectionUtils.isEmpty(projectIds)){
-            throw new BusinessException("请选择项目");
+        String projects = "";
+        if (!CollectionUtils.isEmpty(projectIds)) {
+            projects = String.join(",", projectIds);
         }
-        String projects = String.join(",", projectIds);
-
         csConfigurationPO.setProjectIds(projects);
         //排序不填给个100往后排
-        csConfigurationPO.setOrderBy(Objects.isNull(csConfigurationParm.getOrderBy())?100:csConfigurationParm.getOrderBy());
+        csConfigurationPO.setOrderBy(Objects.isNull(csConfigurationParm.getOrderBy()) ? 100 : csConfigurationParm.getOrderBy());
         csConfigurationPO.setImagePath(csConfigurationParm.getFileContent());
 
         csConfigurationPO.setStatus("1");
@@ -71,7 +70,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
 
         String name = csConfigurationPO.getName();
         Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, name).eq(CsConfigurationPO::getStatus, "1").count();
-        if(count>1){
+        if (count > 1) {
             throw new BusinessException("存在相同的组态项目名称在其他工程项目中，无法新建");
         }
         return save;
@@ -80,30 +79,30 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
     @Override
     public boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm) {
         CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
-        if(Objects.equals(auditParm.getStatus(),"0")){
+        if (Objects.equals(auditParm.getStatus(), "0")) {
             csConfigurationPO.setId(auditParm.getId());
             csConfigurationPO.setStatus("0");
             boolean b = this.updateById(csConfigurationPO);
             return b;
         }
-        Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, auditParm.getName()).ne(CsConfigurationPO::getId,auditParm.getId()).eq(CsConfigurationPO::getStatus, "1").count();
-        if(count>0){
+        Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, auditParm.getName()).ne(CsConfigurationPO::getId, auditParm.getId()).eq(CsConfigurationPO::getStatus, "1").count();
+        if (count > 0) {
             throw new BusinessException("修改名称失败,存在相同的组态项目");
         }
-        BeanUtils.copyProperties(auditParm,csConfigurationPO);
+        BeanUtils.copyProperties(auditParm, csConfigurationPO);
 
         List<String> projectIds = auditParm.getProjectIds();
-        if(!CollectionUtils.isEmpty(projectIds)){
+        if (!CollectionUtils.isEmpty(projectIds)) {
             String projects = String.join(",", projectIds);
             csConfigurationPO.setProjectIds(projects);
 
         }
-        if(!Objects.isNull(auditParm.getOrderBy())){
-            csConfigurationPO.setOrderBy(auditParm.getOrderBy()==0?100:auditParm.getOrderBy());
+        if (!Objects.isNull(auditParm.getOrderBy())) {
+            csConfigurationPO.setOrderBy(auditParm.getOrderBy() == 0 ? 100 : auditParm.getOrderBy());
 
         }
 
-        if(!Objects.isNull(auditParm.getFileContent())){
+        if (!Objects.isNull(auditParm.getFileContent())) {
             String s = fileStorageUtil.uploadStream(writeJsonStringToInputStream(auditParm.getFileContent()), HarmonicConstant.CONFIGURATIONPATH, HarmonicConstant.CONFIGURATIONNAME);
             csConfigurationPO.setImagePath(s);
         }
@@ -115,19 +114,21 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
 
     @Override
     public IPage<CsConfigurationVO> queryPage(CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam) {
-        Page<CsConfigurationVO> returnpage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
-        Page<CsConfigurationPO> temppage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
+        Page<CsConfigurationVO> returnpage = new Page<>(csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize());
+        Page<CsConfigurationPO> temppage = new Page<>(csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize());
 
         List<String> data1 = roleEngineerDevFeignClient.getRoleProject().getData();
-        if(CollectionUtils.isEmpty(data1)){
-            return  returnpage;
-        }
+//        if (CollectionUtils.isEmpty(data1)) {
+//            return returnpage;
+//        }
         //+无线项目id
         data1.add(DataParam.WIRELESS_PROJECT_ID);
-
-
-
-        Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().queryPage(temppage,csConfigurationQueryParam,data1,csConfigurationQueryParam.getCurrentUserId());
+        String userId = csConfigurationQueryParam.getCurrentUserId();
+        String roleCode = csConfigurationQueryParam.getRoleCode();
+        if (roleCode.indexOf("operation_manager") > 0) {
+            userId = null;
+        }
+        Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().queryPage(temppage, csConfigurationQueryParam, data1, userId);
 //        QueryWrapper<CsConfigurationPO> query = new QueryWrapper<>();
 //        query.like(StringUtils.isNotBlank(csConfigurationQueryParam.getSearchValue()),CsConfigurationPO.COL_NAME,csConfigurationQueryParam.getSearchValue()).
 //                le (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchEndTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchEndTime ( )).
@@ -136,7 +137,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
 //        Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().selectPage(temppage, query);
         List<String> collect1 = csConfigurationPOPage.getRecords().stream().map(CsConfigurationPO::getCreateBy).collect(Collectors.toList());
         Map<String, String> collect2;
-        if(!CollectionUtils.isEmpty(collect1)){
+        if (!CollectionUtils.isEmpty(collect1)) {
             List<User> data = userFeignClient.appuserByIdList(collect1).getData();
             collect2 = data.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2));
 
@@ -148,16 +149,16 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
             CsConfigurationVO csDevModelPageVO = new CsConfigurationVO();
             BeanUtils.copyProperties(page, csDevModelPageVO);
 
-            if(StringUtils.isEmpty(page.getProjectIds())){
+            if (StringUtils.isEmpty(page.getProjectIds())) {
                 csDevModelPageVO.setProjectIds(new ArrayList<>());
-            }else {
-                csDevModelPageVO.setProjectIds( Arrays.asList(page.getProjectIds().split(",")));
+            } else {
+                csDevModelPageVO.setProjectIds(Arrays.asList(page.getProjectIds().split(",")));
 
             }
-            if(Objects.isNull(page.getImagePath())){
+            if (Objects.isNull(page.getImagePath())) {
                 csDevModelPageVO.setFileContent(null);
 
-            }else {
+            } else {
                 InputStream fileStream = fileStorageUtil.getFileStream(page.getImagePath());
                 String text = new BufferedReader(
                         new InputStreamReader(fileStream, StandardCharsets.UTF_8))
@@ -174,13 +175,12 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
         returnpage.setTotal(csConfigurationPOPage.getTotal());
 
 
-
         return returnpage;
     }
 
     @Override
     public String uploadImage(MultipartFile issuesFile) {
-        return fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(issuesFile, HarmonicConstant.CONFIGURATIONPATH));
+        return fileStorageUtil.getFileUrl(fileStorageUtil.uploadMultipart(issuesFile, HarmonicConstant.CONFIGURATIONPATH));
     }
 
     /*将strin写入Json文件，返回一个InputStream*/