From a92695f5bfa5ed07b22b03a16f77112b76ebee1e Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Tue, 5 Mar 2024 19:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xymanager_dao/dao/TerminalStatusDao.java  |  1 -
 .../src/main/resources/mappers/LinesDao.xml   |  2 +-
 .../main/resources/mappers/TerminalsDao.xml   |  2 +-
 .../src/main/resources/mappers/TowerDao.xml   |  2 +-
 .../impl/DyLevelServiceImpl.java              |  1 -
 .../impl/RoleServiceImpl.java                 | 71 ++++++++++++-------
 6 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java
index 3aceb1b..e01d4da 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java
@@ -1,6 +1,5 @@
 package com.shxy.xymanager_dao.dao;
 
-import com.shxy.xymanager_common.dto.TerminalInfoDto;
 import com.shxy.xymanager_common.dto.TerminalsWithHeart;
 import com.shxy.xymanager_common.entity.TerminalStatus;
 import org.apache.ibatis.annotations.Param;
diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml
index 030a94f..3bcd899 100644
--- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml
@@ -58,7 +58,7 @@
             distinct
         </if>
         <include refid="Base_Column_List" />
-        from lines
+        from `lines`
         <if test="_parameter != null">
             <include refid="Example_Where_Clause" />
         </if>
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
index 2d17411..3104010 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
@@ -135,7 +135,7 @@
             distinct
         </if>
         <include refid="Base_Column_List" />
-        from towers
+        from terminals
         <if test="_parameter != null">
             <include refid="Example_Where_Clause" />
         </if>
diff --git a/xymanager_dao/src/main/resources/mappers/TowerDao.xml b/xymanager_dao/src/main/resources/mappers/TowerDao.xml
index 985fd87..cf876d8 100644
--- a/xymanager_dao/src/main/resources/mappers/TowerDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TowerDao.xml
@@ -41,7 +41,7 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-    id, name, line_id, create_time, update_time, status, order
+    id, name, line_id, create_time, update_time, `order`,status
   </sql>
     <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TowersExample" resultMap="BaseResultMap">
         select
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java
index 4c5d63b..4c26af4 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java
@@ -40,7 +40,6 @@ public class DyLevelServiceImpl implements DyLevelService {
     @Autowired
     DyLevelDao dyLevelDao;
 
-
     @Autowired
     TerminalChannelMapperDao terminalChannelMapperDao;
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
index 52f75f6..b9485a1 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
@@ -1,18 +1,15 @@
 package com.shxy.xymanager_service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceBody;
-import com.shxy.xymanager_common.dto.DyLineAndTerminalWithHeartDto;
-import com.shxy.xymanager_common.dto.LineAndTerminalWithHeartDto;
-import com.shxy.xymanager_common.dto.TerminalsWithHeart;
 import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.enums.CommonStatus;
 import com.shxy.xymanager_common.enums.PermissionDetailEnum;
 import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.PermissionDyLineTreeListModel;
-import com.shxy.xymanager_common.util.XyNumberUtils;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.RoleService;
 import lombok.extern.slf4j.Slf4j;
@@ -21,9 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import static com.shxy.xymanager_common.constant.Constants.SUPER_ADMIN;
@@ -172,7 +169,6 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public ServiceBody<PermissionDyLineTreeListModel> getPermissionTree() {
         PermissionDyLineTreeListModel model = new PermissionDyLineTreeListModel();
-        List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectPermissionListTreeList();
         List<DyLevel> dyLevels = dyLevelDao.selectByExample(new DyLevelExample());
         List<Lines> lines = linesDao.selectByExample(new LinesExample());
         List<Towers> towers = towerDao.selectByExample(new TowersExample());
@@ -183,29 +179,56 @@ public class RoleServiceImpl implements RoleService {
             model.setList(new ArrayList<>());
         } else {
             model.setList(dyLevels);
-            for (DyLevel dyLevel : dyLevels) {
-                Integer dyid = dyLevel.getId();
-                for (Lines line : lines) {
-                    Integer linedyLevelId = line.getDyLevelId();
-                    if (XyNumberUtils.compare(dyid, linedyLevelId) == 0) {
-                        dyLevel.getList().add(line);
+            HashMap<Integer, DyLevel> dymap = new HashMap<>();
+            HashMap<Integer, Lines> linemap = new HashMap<>();
+            HashMap<Integer, Towers> towermap = new HashMap<>();
+            HashMap<Integer, Terminals> termmap = new HashMap<>();
+            for (DyLevel ditem : dyLevels) {
+                dymap.put(ditem.getId(), ditem);
+            }
+            for (Lines litem : lines) {
+                linemap.put(litem.getId(), litem);
+            }
+            for (Towers titem : towers) {
+                towermap.put(titem.getId(), titem);
+            }
+            for (Terminals termitem : terminals) {
+                termmap.put(termitem.getId(), termitem);
+            }
+
+            for (Terminals termitem : terminals) {
+                Integer towerid = termitem.getTowerid();
+                if (towerid != null) {
+                    Towers towers1 = towermap.get(towerid);
+                    if (BeanUtil.isNotEmpty(towers1)) {
+                        towers1.getList().add(termitem);
                     }
-                    for (Towers tower : towers) {
-                        Integer towerlineId = tower.getLineId();
-                        Integer towerId = tower.getId();
-                        if (XyNumberUtils.compare(towerlineId, towerId) == 0) {
-                            line.getList().add(tower);
-                        }
-                        for (Terminals term : terminals) {
-                            Integer termtowerid = term.getTowerid();
-                            if (XyNumberUtils.compare(termtowerid, towerId) == 0) {
-                                tower.getList().add(term);
-                            }
-                        }
+
+                }
+            }
+
+            for (Towers titem : towers) {
+                Integer lineId = titem.getLineId();
+                if (lineId != null) {
+                    Lines lines1 = linemap.get(lineId);
+                    if (BeanUtil.isNotEmpty(lines1)) {
+                        lines1.getList().add(titem);
+                    }
+                }
+            }
+
+            for (Lines litem : lines) {
+                Integer dyLevelId = litem.getDyLevelId();
+                if (dyLevelId != null) {
+                    DyLevel dyLevel = dymap.get(dyLevelId);
+                    if (BeanUtil.isNotEmpty(dyLevel)) {
+                        dyLevel.getList().add(litem);
                     }
                 }
             }
 
+            ArrayList<DyLevel> dyLevellist = new ArrayList<>(dymap.values());
+            model.setList(dyLevellist);
         }
         return Asserts.success(model);