修改bug

dev
liuguijing 2 years ago
parent 08a941220f
commit 3c82af8ee8

@ -687,26 +687,26 @@ public class TerminalServiceImpl implements TerminalService {
@Override @Override
public ServiceBody<ProtocolListModel> getAllTermDetailsList() { public ServiceBody<ProtocolListModel> getAllTermDetailsList() {
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap(); // Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap(); // Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TermAndChannelDto> termAndChannelMap = cacheService.getTermAndChannelMap(); // Map<Integer, TermAndChannelDto> termAndChannelMap = cacheService.getTermAndChannelMap();
Map<Integer, Protocols> protocolMap = cacheService.getProtocolMap(); // Map<Integer, Protocols> protocolMap = cacheService.getProtocolMap();
Integer dyid = vo.getDyId(); // Integer dyid = vo.getDyId();
Integer lineid = vo.getLineId(); // Integer lineid = vo.getLineId();
Integer tower = vo.getTowerId(); // Integer tower = vo.getTowerId();
String search = vo.getSearch(); // String search = vo.getSearch();
if (StrUtil.isEmpty(search)) { // if (StrUtil.isEmpty(search)) {
search = null; // search = null;
} // }
TerminalListModel model = new TerminalListModel(); // TerminalListModel model = new TerminalListModel();
int pageindex = vo.getPageindex(); // int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize(); // int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize); // PageUtils.SetPage(pageindex, pagesize);
List<TerminalsAndStatusDto> list2 = terminalsDao.selectTermAndStatusList(null, dyid, lineid, tower, search); // List<TerminalsAndStatusDto> list2 = terminalsDao.selectTermAndStatusList(null, dyid, lineid, tower, search);
//
List<TerminalAndLastPicListExcelModel> modellist = new ArrayList<>(); // List<TerminalAndLastPicListExcelModel> modellist = new ArrayList<>();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap(); // Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
List<TerminalsAndStatusAndLastPicDto> list = terminalsDao.selectTermAndStatusAndLastPicList(CommonStatus.EFFECTIVE.value()); // List<TerminalsAndStatusAndLastPicDto> list = terminalsDao.selectTermAndStatusAndLastPicList(CommonStatus.EFFECTIVE.value());
return null; return null;
} }

Loading…
Cancel
Save