Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -267,10 +267,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         onlineDataDto.setPermissonType(loginUser.getPermissonType());
 
-        int[] deviceCount=new int[6];
-        if(onlineDataDto.getSceneTypeName().equals("压力")){
-            deviceCount=new int[5];
-        }
+        int[] deviceCount=new int[5];
         int count=0;
         Double sumValue=null,maxValue=null,minValue=null;
         String maxDeviceName=null,minDeviceName=null;
@@ -324,18 +321,16 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                                    deviceCount[4]++;
                                }
                            }else if(onlineDataDto.getSceneTypeName().equals("流量")){
-                               if(dataValue>=0&&dataValue<=100){
+                               if(dataValue<=0){
                                    deviceCount[0]++;
                                }else if(dataValue<=200) {
                                    deviceCount[1]++;
-                               }else if(dataValue<=300) {
-                                   deviceCount[2]++;
                                }else if(dataValue<=400) {
+                                   deviceCount[2]++;
+                               }else if(dataValue<=600) {
                                    deviceCount[3]++;
-                               }else if(dataValue<=500) {
+                               }else if(dataValue>600) {
                                    deviceCount[4]++;
-                               }else if(dataValue>500) {
-                                   deviceCount[5]++;
                                }
                            }
                        }
@@ -343,6 +338,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                 }
             }
         }
+        deviceCount[0]=result.size()-deviceCount[1]-deviceCount[2]-deviceCount[3]-deviceCount[4];
         DistributeIntervalDto distributeIntervalDto=new DistributeIntervalDto();
         distributeIntervalDto.setDistributeValue(deviceCount);
         distributeIntervalDto.setAvgValue(count==0?null:sumValue/count);