Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java

@@ -101,8 +101,8 @@ public class ResiCategoryStatsConfigController {
             if(null == level2 || level2==0){
                 return new Result().error(8001,"等级2阈值需大于0");
             }
-            if(level1<=level2){
-                return new Result().error(8001,"等级1阈值需大于等级2阈值");
+            if(level2<=level1){
+                return new Result().error(8001,"等级2阈值需大于等级1阈值");
             }
         }
         resiCategoryStatsConfigService.update(customerId,formDTO);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -123,6 +123,8 @@ public class IcResiUserController {
                 log.error("创建数字赋能平台上传目录失败");
             }
         }
+        IC_RESI_UPLOAD_DIR = importDir;
+
         Path exportDir = Paths.get(home, "epmet_files", "ic_user_export");
         if (Files.notExists(exportDir)) {
             try {

epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java

@@ -67,7 +67,7 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
             lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()),
                     30L, 30L, TimeUnit.SECONDS);
             //待执行方法
-            SpringContextUtils.getBean(StatsResiWarnService.class).resiWarnByOne(obj.getCustomerId(), obj.getIcResiUser());
+            SpringContextUtils.getBean(StatsResiWarnService.class).resiWarn(obj.getCustomerId());
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e)));

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

@@ -102,7 +102,9 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         for (IcStatsResiWarnEntity item : icStatsResiWarnEntityList) {
             IcStatsResiWarnBuildingResultDTO resiWarnBuildingResultDTO = warnResultMap.get(item.getConfigId());
 
-
+            if(null == resiWarnBuildingResultDTO){
+                continue;
+            }
             //每栋楼的数量
             Integer count = Optional.ofNullable(item.getCount()).orElse(0);
 
@@ -114,18 +116,15 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
             if(0 == count){
                 continue;
             }
-            if(null!=levle1 && count>levle1){
-                resiWarnBuildingResultDTO.setLevelCount1(resiWarnBuildingResultDTO.getLevelCount1()+1);
-                resiWarnBuildingResultDTO.getBuildingIdList1().add(item.getBuildingId());
-            }
-            if(null!=levle1 && null!=levle2 && count<=levle1 && count>=levle2){
+            if(null!=levle2 && count>levle2){
                 resiWarnBuildingResultDTO.setLevelCount2(resiWarnBuildingResultDTO.getLevelCount2()+1);
                 resiWarnBuildingResultDTO.getBuildingIdList2().add(item.getBuildingId());
             }
-            if(null!=levle2 && null!=levle3 && count<=levle2 && count>=levle3){
-                resiWarnBuildingResultDTO.setLevelCount3(resiWarnBuildingResultDTO.getLevelCount3()+1);
-                resiWarnBuildingResultDTO.getBuildingIdList3().add(item.getBuildingId());
+            if(null!=levle1 && null!=levle2 && count<=levle2 && count>=levle1){
+                resiWarnBuildingResultDTO.setLevelCount1(resiWarnBuildingResultDTO.getLevelCount1()+1);
+                resiWarnBuildingResultDTO.getBuildingIdList1().add(item.getBuildingId());
             }
+
         }
         return result;