Merge branch 'dev_warn_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线开发

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;
 }

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) {

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>
+</mapper>