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 e13fd60..3c89e37 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 @@ -305,7 +305,7 @@ public class TerminalUtils { } - public static List fdsa(String requestIp, List list, Map terminalMap, Map lineMap, Map termchannelMap, Map termchannelMapMap) { + public static List fdsa(String requestIp, List list, Map terminalMap, Map lineMap, Map towerMap, Map termchannelMap, Map termchannelMapMap) { List beans = new ArrayList<>(); for (TerminalPhoto item : list) { TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); @@ -315,12 +315,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 e7954eb..3977a9e 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 @@ -226,9 +226,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } else { Map terminalMap = cacheService.getTerminalMap(); Map lineMap = cacheService.getLineMap(); + Map towerMap = cacheService.getTowerMap(); Map termchannelMap = cacheService.getTermChannelMap(); Map 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); } } @@ -552,9 +553,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } else { Map terminalMap = cacheService.getTerminalMap(); Map lineMap = cacheService.getLineMap(); + Map towerMap = cacheService.getTowerMap(); Map termchannelMap = cacheService.getTermChannelMap(); Map 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);