修改bug

dev
liuguijing 2 years ago
parent 08a941220f
commit 3c82af8ee8

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

Loading…
Cancel
Save