From d52e8a9eddbd0785c48b3642f743004a085822c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Mon, 28 Apr 2025 17:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A2=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/controller/TbProjectController.java |  2 +-
 .../basic/dao/TbProjectMapper.java            |  2 ++
 .../service/impl/TbProjectServiceImpl.java    |  8 ++++-
 .../basic/vo/TbCablewaTransVo.java            |  5 +++
 .../digitalSignage/basic/vo/TbProjectVo.java  |  5 +++
 .../mappers/basic/TbCablewaTransMapper.xml    |  3 ++
 .../mappers/basic/TbProjectMapper.xml         | 32 +++++++++++++++++++
 7 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java
index dcb4a2e..3e32a77 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java
@@ -39,7 +39,7 @@ public class TbProjectController {
     @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理
     @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "查询列表", operDesc = "系统级事件",operType="查询")
     public ServerResponse getTbProjectList(EncryptedReq<TbProjectVo> dto) {
-        PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize());
+
         return tbProjectService.getTbProjectList(dto.getData());
     }
 
diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java
index 2124728..aa531e7 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java
@@ -16,4 +16,6 @@ public interface TbProjectMapper {
     TbProjectVo getTbProjectByProName(TbProjectVo data);
 
     void delTbProject(TbProjectVo data);
+
+    List<Long> getDataAuthByDeptId(Long deptId);
 }
diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
index f3d7ae5..9502cc0 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
@@ -13,11 +13,13 @@ import com.bonus.digitalSignage.system.vo.LoginUser;
 import com.bonus.digitalSignage.utils.ServerResponse;
 import com.bonus.digitalSignage.utils.UserUtil;
 import com.bonus.digitalSignage.webResult.StringUtils;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -50,7 +52,11 @@ public class TbProjectServiceImpl implements TbProjectService {
     @Override
     public ServerResponse getTbProjectList(TbProjectVo data) {
         try {
-            LoginUser oginUser = UserUtil.getLoginUser();
+            Long deptId = UserUtil.getLoginUser().getDept();
+            List<Long> deptIds = tbProjectMapper.getDataAuthByDeptId(deptId);
+            data.setDeptIds(deptIds);
+
+            PageHelper.startPage(data.getPageNum(), data.getPageSize());
             //获取工程列表
             List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
             TbTowerVo tbTowerVo = new TbTowerVo();
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
index c28710f..d8d0a60 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
@@ -82,6 +82,11 @@ public class TbCablewaTransVo {
      */
     private Long updateUserId;
 
+    /**
+     * 搜索
+     */
+    private String keyWord;
+
     private int pageNum = 1;
     private int pageSize = 10;
 }
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
index 9941253..51bedaf 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
@@ -117,6 +117,11 @@ public class TbProjectVo {
      */
     private Long updateUserId;
 
+    /**
+     * 权限列表
+     */
+    private List<Long> deptIds;
+
     /**
      * 杆塔数量
      */
diff --git a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
index 96511e6..748bfb6 100644
--- a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
+++ b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
@@ -51,6 +51,9 @@
                 from tb_cablewa_trans tct
                 left join tb_tower tt on tct.tower_id = tt.id
                 where tct.pro_id = #{proId} and tct.is_active = '1'
+        <if test="keyWord != '' and keyWord != null">
+            and tt.tower_name like concat('%',#{keyWord},'%')
+        </if>
     </select>
     <select id="getTbCablewaTransById" resultType="com.bonus.digitalSignage.basic.vo.TbCablewaTransVo">
         select tct.id as id,tct.pro_id as proId,tct.tower_id as towerId,tct.cableway_length as cablewayLength,
diff --git a/src/main/resources/mappers/basic/TbProjectMapper.xml b/src/main/resources/mappers/basic/TbProjectMapper.xml
index 3a7b43f..bcee187 100644
--- a/src/main/resources/mappers/basic/TbProjectMapper.xml
+++ b/src/main/resources/mappers/basic/TbProjectMapper.xml
@@ -80,6 +80,13 @@
         <if test="departName != '' and departName != null">and td.depart_name  like concat('%', #{departName}, '%')</if>
         <if test="proName != '' and proName != null"> and tp.pro_name like concat('%', #{proName}, '%')</if>
         <if test="proStatus != '' and proStatus != null"> and tp.pro_status = #{proStatus}</if>
+        <if test="deptIds != '' and deptIds != null">
+          and tp.depart_id IN
+            <foreach item="item" index="index" collection="deptIds"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getTbProjectById" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">
         select tp.id as id,depart_id as departId,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength,
@@ -93,4 +100,29 @@
                tp.address as address,tp.pro_status as pro_status
         from tb_project tp where pro_name = #{proName} and is_active ='1'
     </select>
+    <select id="getDataAuthByDeptId" resultType="java.lang.Long">
+        SELECT all_children.id
+        FROM (
+                 SELECT t3.id
+                 FROM (
+                          SELECT
+                              t1.id,
+                              t1.parent_id,
+                              IF(
+                                          FIND_IN_SET(t1.parent_id, @pids) > 0,
+                                          @pids := CONCAT(@pids, ',', t1.id),
+                                          -1
+                                  ) AS ischild
+                          FROM
+                                  (SELECT id, parent_id FROM tb_depart WHERE is_active = '1') t1,
+                                  (SELECT @pids :=#{dept}) t2
+                          ORDER BY t1.parent_id, t1.id  -- 确保父节点先处理
+                      ) t3
+                 WHERE t3.ischild != -1
+             ) all_children
+                 LEFT JOIN tb_depart d
+                           ON all_children.id = d.parent_id
+                               AND d.is_active = '1'
+        WHERE d.parent_id IS NULL;
+    </select>
 </mapper>