From fe76b6e6f76b168a42a1153efcb53daae40eeddb Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 4 Aug 2023 11:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E7=BD=AE=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/TerminalChannelsDao.xml | 41 ++++++------
 .../impl/TerminalChannelServiceImpl.java      | 64 +++++++++++++++++--
 2 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
index 98c58df..d974bad 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
@@ -148,28 +148,29 @@
     </select>
     <select id="selectAllAndChannelByTermid" resultMap="LineAndTerminalMap">
         SELECT
-        z.id AS id,
-        z.name AS name,
-        z.dy_value AS dyvalue,
-        x.id AS line_id,
-        x.name AS line_name,
-        x.bs_manufacturer AS bs_manufacturer,
-        y.id AS term_id,
-        y.tower_id AS tower_id,
-        y.cmdid AS cmdid,
-        y.display_name AS display_name,
-        k.id AS channel_id,
-        k.channel_name AS channel_name,
-        l.schedule_id AS schedule_id
+        a.id AS id,
+        a.name AS name,
+        a.dy_value AS dyvalue,
+        b.id AS line_id,
+        b.name AS line_name,
+        b.bs_manufacturer AS bs_manufacturer,
+        d.id AS term_id,
+        d.tower_id AS tower_id,
+        d.cmdid AS cmdid,
+        d.display_name AS display_name,
+        f.id AS channel_id,
+        f.channel_name AS channel_name,
+        g.schedule_id AS schedule_id
         FROM
-        (((((dy_level z
-        left JOIN `lines` x ON z.id = x.dy_level_id and z.status = #{status} and x.status = #{status})
-        left JOIN terminals y ON x.id = y.line_id and y.status = #{status})
-        left JOIN terminal_channel_mapper j ON j.term_id = y.id)
-        left JOIN terminal_channels k ON j.channel_id = k.id and k.status = #{status})
-        left JOIN terminal_schedule l ON k.id = l.channel_id and l.term_id = y.id)
+        (((((dy_level a
+        left JOIN `lines` b ON  a.id = b.dy_level_id and  a.status = #{status} and b.status = #{status})
+        left join towers c on b.id = c.line_id
+        left JOIN terminals d ON c.id = d.tower_id and d.status = #{status})
+        left JOIN terminal_channel_mapper e ON e.term_id = d.id)
+        left JOIN terminal_channels f ON e.channel_id = f.id and f.status = #{status})
+        left JOIN terminal_schedule g ON f.id = g.channel_id and g.term_id = d.id)
         <if test="termid != null">
-            where y.id = #{termid}
+            where d.id = #{termid}
         </if>
     </select>
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
index 24d4425..bcf5449 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
@@ -6,10 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
-import com.shxy.xymanager_common.dto.DyLineAndTerminalAndChannelDto;
-import com.shxy.xymanager_common.dto.LineAndDyNameDto;
-import com.shxy.xymanager_common.dto.TermChannelAndMapperDto;
-import com.shxy.xymanager_common.dto.TowerDto;
+import com.shxy.xymanager_common.dto.*;
 import com.shxy.xymanager_common.entity.TerminalChannels;
 import com.shxy.xymanager_common.entity.TerminalStatus;
 import com.shxy.xymanager_common.entity.Terminals;
@@ -21,6 +18,7 @@ import com.shxy.xymanager_common.model.TerminalChannelListModel;
 import com.shxy.xymanager_common.model.TerminalChannelMapperListModel;
 import com.shxy.xymanager_common.page.PageUtils;
 import com.shxy.xymanager_common.vo.*;
+import com.shxy.xymanager_dao.dao.DyLevelDao;
 import com.shxy.xymanager_dao.dao.TerminalChannelsDao;
 import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
 import com.shxy.xymanager_dao.dao.TerminalStatusDao;
@@ -51,6 +49,9 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
     @Autowired
     TerminalPhotoDao terminalPhotoDao;
 
+    @Autowired
+    DyLevelDao dyLevelDao;
+
     @Autowired
     CacheService cacheService;
 
@@ -232,6 +233,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
      */
     @Override
     public ServiceBody<DyLineTreeAndChannelListModel> getChannelTreeList(TerminalIdVo vo) {
+        Integer termId = vo.getTermid();
         DyLineTreeAndChannelListModel model = new DyLineTreeAndChannelListModel();
         List<TerminalChannels> channellist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
         ArrayList<DyLineTreeAndChannelListModel.ChannelChooseBean> channels = new ArrayList<>();
@@ -244,6 +246,60 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
             channels.add(channelChooseBean);
         }
         model.setChannellist(channels);
+
+//        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+//        Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
+//        Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
+//        List<DyAndLineAndTowerAndTermDto> dtos = dyLevelDao.selectDyAndLineAndTowerAnTermList(null, null, null, termId, null, CommonStatus.EFFECTIVE.value());
+
+
+//        ArrayList<DyLineTreeAndChannelListModel.DyListBean> dymodellist = new ArrayList<>();
+//        for (int i = 0; i < dtos.size(); i++) {
+//            DyAndLineAndTowerAndTermDto dyDto = dtos.get(i);
+//            List<LineAndTowerAndTermDto> linelist = dyDto.getList();
+//            DyLineTreeAndChannelListModel.DyListBean dyListBean = new DyLineTreeAndChannelListModel.DyListBean();
+//            dyListBean.setId(dyDto.getId());
+//            dyListBean.setName(dyDto.getName());
+//            dyListBean.setDyValue(dyDto.getDyValue());
+//
+//            ArrayList<DyLineTreeAndChannelListModel.LineBean> linemodellist = new ArrayList<>();
+//            if (CollectionUtil.isEmpty(linelist)) {
+//                continue;
+//            }
+//            for (int j = 0; j < linelist.size(); j++) {
+//                LineAndTowerAndTermDto lineDto = linelist.get(j);
+//                List<TowerAndTermDto> termlist = lineDto.getList();
+//                DyLineTreeAndChannelListModel.LineBean linebean = new DyLineTreeAndChannelListModel.LineBean();
+//                linebean.setId(lineDto.getId());
+//                linebean.setName(lineDto.getName());
+//                linebean.setBsManufacturer(lineDto.getBsManufacturer());
+//                if (CollectionUtil.isEmpty(termlist)) {
+//                    continue;
+//                }
+//                for (int k = 0; k < termlist.size(); k++) {
+//                    TowerAndTermDto towerAndTermDto = termlist.get(k);
+//                    List<Terminals> list = towerAndTermDto.getList();
+//                    for (int l = 0; l < list.size(); l++) {
+//                        Terminals terminals = list.get(l);
+//                        DyLineTreeAndChannelListModel.TerminalBean termBean = new DyLineTreeAndChannelListModel.TerminalBean();
+//                        termBean.setId(terminals.getId());
+//                        termBean.setCmdid(terminals.getCmdid());
+//                        termBean.setName(terminals.getName());
+//                        termBean.setTowerid(terminals.getTowerid());
+//                    }
+//
+//                }
+//                linebean.setList();
+//                linemodellist.add(linebean);
+//            }
+//
+//            dyListBean.setList(linemodellist);
+//
+//            dymodellist.add(dyListBean);
+//        }
+
+//        model.setList(dymodellist);
+
         List<DyLineAndTerminalAndChannelDto> list = terminalChannelsDao.selectAllAndChannelByTermid(vo.getTermid(), CommonStatus.EFFECTIVE.value());
         boolean empty = CollectionUtil.isEmpty(list);
         if (empty) {