From 584e8c42b76dd09a793cba595dc3d0a56fa4eb8a Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 29 May 2024 09:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E4=B8=8B=E8=BD=BDexcel=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/controller/WarningController.java | 18 ++++++++++--------
 .../resources/mapper/AddressBookMapper.xml     |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java
index dc3dd64..bf609e5 100644
--- a/src/main/java/com/whdc/controller/WarningController.java
+++ b/src/main/java/com/whdc/controller/WarningController.java
@@ -230,6 +230,7 @@ public class WarningController {
                     vo.setPublishTime(warning.getPublishTime());
                     vo.setContent(warning.getContent());
                     vo.setWarnSignalType(warning.getWarnSignalType());
+                    vo.setWarnSignalLevel(warning.getWarnSignalLevel());
                     vo.setAdnm(publishUnit.replace("气象台", ""));
                     vo.setAddressBooks(addressBookService.getListByAdnm(publishUnit.replace("气象台", "")));
                     respList.add(vo);
@@ -318,17 +319,18 @@ public class WarningController {
 
             List<WarningHistoryListVo> typeList = Lists.newArrayList();
 
-            // 类型
+            // 类型 只要暴雨
             Map<String, List<WarningData.Warning>> types = v.stream()
+                    .filter(o -> "暴雨".equals(o.getWarnSignalType()))
                     .collect(Collectors
                             .groupingBy(WarningData.Warning::getWarnSignalType, Collectors.toList()));
 
-            Set<String> warnSignalType = Sets.newHashSet("雷电", "暴雨", "大风", "冰雹", "雷雨大风");
+//            Set<String> warnSignalType = Sets.newHashSet("雷电", "暴雨", "大风", "冰雹", "雷雨大风");
             types.forEach((kt, vt) -> {
 
                 WarningHistoryListVo voType = new WarningHistoryListVo();
                 voType.setWarnSignalType(kt);
-                warnSignalType.remove(kt);
+//                warnSignalType.remove(kt);
                 // 等级分组
                 Map<String, Long> levels = vt.stream()
                         .collect(Collectors.groupingBy(WarningData.Warning::getWarnSignalLevel, Collectors.counting()));
@@ -361,11 +363,11 @@ public class WarningController {
             });
 
             // 保证完整数据
-            warnSignalType.forEach(kt -> {
-                WarningHistoryListVo voType = new WarningHistoryListVo();
-                voType.setWarnSignalType(kt);
-                typeList.add(voType);
-            });
+//            warnSignalType.forEach(kt -> {
+//                WarningHistoryListVo voType = new WarningHistoryListVo();
+//                voType.setWarnSignalType(kt);
+//                typeList.add(voType);
+//            });
 
             vo.setChild(typeList);
             vo.setSumCount(v.size());
diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml
index 8e53bd7..ab1d70b 100644
--- a/src/main/resources/mapper/AddressBookMapper.xml
+++ b/src/main/resources/mapper/AddressBookMapper.xml
@@ -54,11 +54,13 @@
         FROM
             ADDRESS_BOOK AB
                 LEFT JOIN ADINFO A ON AB.ADCD = A.ADCD
+                LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
         <where>
             <if test="adnm != null and adnm != '' ">
                 A.ADNM = #{adnm}
             </if>
         </where>
+        ORDER BY R.SORT
     </select>