From 74c4ff3580027269fd29b367a2e585a2e889ecb7 Mon Sep 17 00:00:00 2001 From: guo Date: Sat, 2 Mar 2024 22:30:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AiAnalyseHardWareAlarmRecordServiceImpl.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index a00e72a2c..a9e39cfb1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -92,9 +92,22 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl queryAiAnalyseHardWareAlarmPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); + String projectSn = MapUtils.getString(map, "projectSn"); Page page = new Page<>(pageNo, pageSize); - List list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map); - return page.setRecords(list); + List aiAnalyseHardWareAlarmRecords = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map); + List dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, projectSn); + try { + Map 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