From bfe81b74a4752ed281f313492b6ee15a690dcee5 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Wed, 25 Oct 2023 14:19:55 +0800
Subject: [PATCH] =?UTF-8?q?ai=E9=A2=84=E8=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/base/entity/vo/SectorVo.java   | 11 ++++++++++-
 .../mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml |  1 +
 .../impl/AiAnalyseHardWareAlarmRecordServiceImpl.java |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java
index a638380b6..69f190af3 100644
--- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java
+++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java
@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -75,9 +76,10 @@ public class SectorVo {
      *
      * @param list
      * @param dictionaryItems
+     * @param sorted          是否倒序
      * @return
      */
-    public static SectorVo getSectorVoByDict(List<SectorOneVo> list, List<DictionaryItem> dictionaryItems) {
+    public static SectorVo getSectorVoByDict(List<SectorOneVo> list, List<DictionaryItem> dictionaryItems, Boolean sorted) {
         SectorVo vo = new SectorVo();
         List<SectorOneVo> rtList = new ArrayList<>();
         Map<Integer, SectorOneVo> map = list.stream().collect(Collectors.toMap(SectorOneVo::getEnumType, Function.identity()));
@@ -91,12 +93,19 @@ public class SectorVo {
             vo1.setEnumType(Integer.valueOf(type.getData()));
             rtList.add(vo1);
         }
+        if (Objects.equals(sorted, true)) {
+            rtList = rtList.stream().sorted((o1, o2) -> Integer.valueOf(o2.getCount()).compareTo(Integer.valueOf(o1.getCount()))).collect(Collectors.toList());
+        }
         vo.setData(rtList);
         vo.setCount(String.valueOf(rtList.stream().map(o -> Integer.parseInt(o.getCount())).mapToInt(value -> value).sum()));
         calPercent(vo);
         return vo;
     }
 
+    public static SectorVo getSectorVoByDict(List<SectorOneVo> list, List<DictionaryItem> dictionaryItems) {
+        return getSectorVoByDict(list, dictionaryItems, null);
+    }
+
     /**
      * 计算总count
      *
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
index e023b0024..c841292db 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
@@ -126,6 +126,7 @@
         </include>
         where di.dictionary_encoding = 'ai_analyse_hard_ware_alarm_record_type'
         group by di.data
+        order by count desc
     </select>
     <select id="selectAiAnalyseHardWareAlarmTypeCount" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT w1.alarm_type alarmType,
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 1cfcfc546..01911403e 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
@@ -193,7 +193,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     @Override
     public SectorVo getAiAnalyseHardWareAlarmTotal(Map<String, Object> map) {
         List<SectorOneVo> list = aiAnalyseHardWareAlarmRecordMapper.getAiAnalyseHardWareAlarmTotal(map);
-        return SectorVo.getSectorVoByDict(list, dictionaryItemService.getDictList(DictConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE));
+        return SectorVo.getSectorVoByDict(list, dictionaryItemService.getDictList(DictConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE), true);
     }
 
     /**