From 9ced7fa91512e309df6df315727b94c1dec90716 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 18 Aug 2023 13:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/xinyin/TerminalUtils.java             | 18 +++++++++++-------
 .../impl/TerminalPhotoServiceImpl.java         |  6 ++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
index ea78efb..bc4b462 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
@@ -292,7 +292,7 @@ public class TerminalUtils {
     }
 
 
-    public static List<TerminalPhotoSelectListModel.PhotoBean> fdsa(String requestIp, List<TerminalPhoto> list, Map<Integer, Terminals> terminalMap, Map<Integer, LineAndDyNameDto> lineMap, Map<Integer, TerminalChannels> termchannelMap, Map<String, TerminalChannelMapper> termchannelMapMap) {
+    public static List<TerminalPhotoSelectListModel.PhotoBean> fdsa(String requestIp, List<TerminalPhoto> list, Map<Integer, Terminals> terminalMap, Map<Integer, LineAndDyNameDto> lineMap, Map<Integer, TowerDto> towerMap, Map<Integer, TerminalChannels> termchannelMap, Map<String, TerminalChannelMapper> termchannelMapMap) {
         List<TerminalPhotoSelectListModel.PhotoBean> beans = new ArrayList<>();
         for (TerminalPhoto item : list) {
             TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean();
@@ -302,12 +302,16 @@ public class TerminalUtils {
                 Integer mediaType = item.getMediaType();
                 if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
                     photoBean.setDisplayname(terminals.getDisplayName());
-                    Integer lineid = terminals.getLineid();
-                    photoBean.setLineid(lineid);
-                    if (lineMap != null) {
-                        LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid);
-                        if (lineAndDyNameDto != null) {
-                            photoBean.setLinename(lineAndDyNameDto.getName());
+                    Integer towerid = terminals.getTowerid();
+                    if (towerMap != null) {
+                        TowerDto towerDto = towerMap.get(towerid);
+                        Integer lineId = towerDto.getLineId();
+                        photoBean.setLineid(lineId);
+                        if (lineMap != null) {
+                            LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineId);
+                            if (lineAndDyNameDto != null) {
+                                photoBean.setLinename(lineAndDyNameDto.getName());
+                            }
                         }
                     }
                     Integer channelId = item.getChannelId();
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
index ac077f7..a7588c3 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
@@ -222,9 +222,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
             } else {
                 Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
                 Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
+                Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
                 Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
                 Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
-                beans = TerminalUtils.fdsa(requestIp, list, terminalMap, lineMap, termchannelMap, termchannelMapMap);
+                beans = TerminalUtils.fdsa(requestIp, list, terminalMap, lineMap, towerMap, termchannelMap, termchannelMapMap);
                 model.setList(beans);
             }
         }
@@ -548,9 +549,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         } else {
             Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
             Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
+            Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
             Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
             Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
-            beans = TerminalUtils.fdsa(requestIp, list, terminalMap, lineMap, termchannelMap, termchannelMapMap);
+            beans = TerminalUtils.fdsa(requestIp, list, terminalMap, lineMap, towerMap, termchannelMap, termchannelMapMap);
             model.setList(beans);
         }
         PageInfo pageData = PageUtils.getPageData(list);