更改level

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