xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/schedule' into schedule

Browse Source
dev
guijing.liu 2 years ago
parent 7ff7562271 9ced7fa915
commit 4166147619
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File

12
xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
Unescape Escape View File

@ -305,7 +305,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<>(); List<TerminalPhotoSelectListModel.PhotoBean> beans = new ArrayList<>();
for (TerminalPhoto item : list) { for (TerminalPhoto item : list) {
TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean();
@ -315,14 +315,18 @@ public class TerminalUtils {
Integer mediaType = item.getMediaType(); Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
photoBean.setDisplayname(terminals.getDisplayName()); photoBean.setDisplayname(terminals.getDisplayName());
Integer lineid = terminals.getLineid(); Integer towerid = terminals.getTowerid();
photoBean.setLineid(lineid); if (towerMap != null) {
TowerDto towerDto = towerMap.get(towerid);
Integer lineId = towerDto.getLineId();
photoBean.setLineid(lineId);
if (lineMap != null) { if (lineMap != null) {
LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid); LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineId);
if (lineAndDyNameDto != null) { if (lineAndDyNameDto != null) {
photoBean.setLinename(lineAndDyNameDto.getName()); photoBean.setLinename(lineAndDyNameDto.getName());
} }
} }
}
Integer channelId = item.getChannelId(); Integer channelId = item.getChannelId();
photoBean.setChannelid(channelId); photoBean.setChannelid(channelId);
photoBean.setCmdid(terminals.getCmdid()); photoBean.setCmdid(terminals.getCmdid());

6
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
Unescape Escape View File

@ -226,9 +226,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
} else { } else {
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap(); Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap(); Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap(); Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap(); 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); model.setList(beans);
} }
} }
@ -552,9 +553,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
} else { } else {
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap(); Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap(); Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap(); Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap(); 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); model.setList(beans);
} }
PageInfo pageData = PageUtils.getPageData(list); PageInfo pageData = PageUtils.getPageData(list);

Write Preview
Loading…
Cancel
Save