From 606d7a303fd79cf473a9a7272f030a3672f402d2 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 16 Mar 2022 21:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B7=E5=90=8D=E7=B1=BB=E5=88=AB=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/IcUserWarnNoticeResultDTO.java     | 4 ++++
 .../com/epmet/service/impl/StatsResiWarnServiceImpl.java    | 6 +++++-
 .../src/main/resources/mapper/IcStatsResiWarnDao.xml        | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java
index fb6fde9599..a9a847e6d8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java
@@ -20,4 +20,8 @@ public class IcUserWarnNoticeResultDTO implements Serializable {
     private String noticeContent;
     // @JsonIgnore
     private String buildingId;
+    /**
+     * desc:该号楼有多少个符合条件的人
+     */
+    private Integer count;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
index e7507aeefb..26da3f073d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
@@ -361,10 +361,14 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         }
         //2、符合条件的楼栋
         Map<String, String> configMap = warnResult.getData().stream().collect(Collectors.toMap(IcResiCategoryWarnConfigDTO::getId, IcResiCategoryWarnConfigDTO::getLabel));
-        List<String> configIds = warnResult.getData().stream().map(m -> m.getId()).collect(Collectors.toList());
+        List<String> configIds = warnResult.getData().stream().map(IcResiCategoryWarnConfigDTO::getId).collect(Collectors.toList());
         List<IcUserWarnNoticeResultDTO> list = icStatsResiWarnDao.queryUserWarnNotice(formDTO.getCustomerId(), formDTO.getAgencyId(), configIds);
         List<IcUserWarnNoticeResultDTO> resList = new ArrayList<>();
+        Map<String, Integer> level1ThresholdMap = warnResult.getData().stream().collect(Collectors.toMap(IcResiCategoryWarnConfigDTO::getId, IcResiCategoryWarnConfigDTO::getLevel1));
         for (IcUserWarnNoticeResultDTO dto : list) {
+            if (dto.getCount()<level1ThresholdMap.get(dto.getConfigId())){
+                continue;
+            }
             //南宁路社区第二网格亿联小区2号楼失业人员超出预警！
             BuildingInfoCache infoCache = CustomerIcHouseRedis.getBuildingInfo(dto.getBuildingId());
             if (null == infoCache) {
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
index 9a82e55133..4e2dae8afa 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
@@ -187,7 +187,8 @@
     <select id="queryUserWarnNotice" parameterType="map" resultType="com.epmet.dto.result.IcUserWarnNoticeResultDTO">
         SELECT
             ir.BUILDING_ID,
-            ir.CONFIG_ID
+            ir.CONFIG_ID,
+            ir.COUNT
         FROM
             ic_stats_resi_warn ir
         WHERE
@@ -200,4 +201,4 @@
                 </foreach>
             )
     </select>
-</mapper>
\ No newline at end of file
+</mapper>