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

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

@@ -70,7 +70,9 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
         IcResiUserAddMQMsg obj = JSON.parseObject(msg, IcResiUserAddMQMsg.class);
         log.info("obj is {}", JSON.toJSONString(obj));
         try {
-            if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)||!updateIcHouseResiNumber(obj)){
+            //todo 统计预警人数和 更新屋内居民数 用定时任务跑吧 这样太费劲
+            //||!updateIcHouseResiNumber(obj)
+            if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费");
             }
         } catch (RenException e) {