Merge branch 'server-165' of uskycloud/usky-modules into master

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataQueryServiceImpl.java

@@ -206,11 +206,11 @@ public class DataQueryServiceImpl implements DataQueryService {
                                 if(list1.get(k).getAttributeName().equals("voc")){ //voc平均值（优就是1，良是2，差是3）
                                     String name = "";
                                     double value = list1.get(k).getAvrg();
-                                    if(value>=1 && value<=1.5){
+                                    if(value>=0 && value<=1.5){
                                         name = "优";
                                     }else if(value>1.5 && value<=2.5){
                                         name = "良";
-                                    }else if(value>2.5 && value<=3){
+                                    }else if(value>2.5){
                                         name = "差";
                                     }
                                     responseVO.setVoc(name);
@@ -218,7 +218,7 @@ public class DataQueryServiceImpl implements DataQueryService {
                                 if(list1.get(k).getAttributeName().equals("quality")){ //空气质量平均值（1、优质 2、良好 3、轻度污染 4、中度污染 5、重度污染 6、严重污染）
                                     String name = "";
                                     double value = list1.get(k).getAvrg();
-                                    if(value>=1 && value<=1.5){
+                                    if(value>=0 && value<=1.5){
                                         name = "优质";
                                     }else if(value>1.5 && value<=2.5){
                                         name = "良好";
@@ -228,7 +228,7 @@ public class DataQueryServiceImpl implements DataQueryService {
                                         name = "中度污染";
                                     }else if(value>4.5 && value<=5.5){
                                         name = "重度污染";
-                                    }else if(value>5.5 && value<=6){
+                                    }else if(value>5.5){
                                         name = "严重污染";
                                     }
                                     responseVO.setQuality(name);