bug修复
This commit is contained in:
parent
87c26c585e
commit
74c4ff3580
@ -92,9 +92,22 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
|
|||||||
public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
|
public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
|
||||||
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
|
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
|
||||||
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
|
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
|
||||||
|
String projectSn = MapUtils.getString(map, "projectSn");
|
||||||
Page<AiAnalyseHardWareAlarmRecord> page = new Page<>(pageNo, pageSize);
|
Page<AiAnalyseHardWareAlarmRecord> page = new Page<>(pageNo, pageSize);
|
||||||
List<AiAnalyseHardWareAlarmRecord> list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map);
|
List<AiAnalyseHardWareAlarmRecord> aiAnalyseHardWareAlarmRecords = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map);
|
||||||
return page.setRecords(list);
|
List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, projectSn);
|
||||||
|
try {
|
||||||
|
Map<String, DictionaryItem> typeMap = dictList.stream().collect(Collectors.toMap(DictionaryItem::getData, Function.identity(), (dictionaryItem, dictionaryItem2) -> dictionaryItem));
|
||||||
|
for (AiAnalyseHardWareAlarmRecord record : aiAnalyseHardWareAlarmRecords) {
|
||||||
|
DictionaryItem item = typeMap.get(record.getAlarmType() + "");
|
||||||
|
if (item != null) {
|
||||||
|
record.setAlarmTypeName(item.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return page.setRecords(aiAnalyseHardWareAlarmRecords);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user