水质统计修改

sms_water/src/main/java/com/huaxu/service/SecSupplyService.java

@@ -190,6 +190,16 @@ public class SecSupplyService {
         WaterPieDto waterPieDto = new WaterPieDto();
         DeviceParmEntity deviceParmEntity = new DeviceParmEntity();
         deviceParmEntity.setSceneEntities(sceneEntities);
+
+
+        List<ParmTypeCountDto> listTotal = deviceParmService.findAlarmTotalCount(deviceParmEntity);
+        WaterPieStateDto waterPieStateDto4 = new WaterPieStateDto();
+        waterPieStateDto4.setNormalCount(listTotal.get(0).getTotalCount()- listTotal.get(0).getNbnormalCount());
+        waterPieStateDto4.setNbnormalCount(listTotal.get(0).getNbnormalCount());
+        waterPieStateDto4.setPercentage((double) (Math.round((Double.valueOf(listTotal.get(0).getTotalCount()- listTotal.get(0).getNbnormalCount())/Double.valueOf(listTotal.get(0).getTotalCount()))*100)));
+        waterPieDto.setWaterQuality(waterPieStateDto4);
+
+
         List<ParmTypeCountDto> list = deviceParmService.findAlarmCount(deviceParmEntity);
         //余氯11 浊度9  PH8  cod 15   15,8,9,11,18,19
         for(ParmTypeCountDto item : list)
@@ -198,35 +208,30 @@ public class SecSupplyService {
             {
                 case 8:
                     WaterPieStateDto waterPieStateDto1 = new WaterPieStateDto();
-                    waterPieStateDto1.setNormalCount(item.getTotalCount()- item.getNbnormalCount());
+                    waterPieStateDto1.setNormalCount(listTotal.get(0).getTotalCount()- item.getNbnormalCount());
                     waterPieStateDto1.setNbnormalCount(item.getNbnormalCount());
                     DecimalFormat df1 = new DecimalFormat("#.00");
-                    waterPieStateDto1.setPercentage((double) (Math.round((Double.valueOf(item.getTotalCount()- item.getNbnormalCount())/Double.valueOf(item.getTotalCount()))*100)));
+                    waterPieStateDto1.setPercentage((double) (Math.round((Double.valueOf(listTotal.get(0).getTotalCount()- item.getNbnormalCount())/Double.valueOf(listTotal.get(0).getTotalCount()))*100)));
                     waterPieDto.setPh(waterPieStateDto1);
                     break;
                 case 9:
                     WaterPieStateDto waterPieStateDto2 = new WaterPieStateDto();
-                    waterPieStateDto2.setNormalCount(item.getTotalCount()- item.getNbnormalCount());
+                    waterPieStateDto2.setNormalCount(listTotal.get(0).getTotalCount()- item.getNbnormalCount());
                     waterPieStateDto2.setNbnormalCount(item.getNbnormalCount());
                     DecimalFormat df2 = new DecimalFormat("#.00");
-                    waterPieStateDto2.setPercentage((double) (Math.round((Double.valueOf(item.getTotalCount()- item.getNbnormalCount())/Double.valueOf(item.getTotalCount()))*100)));
+                    waterPieStateDto2.setPercentage((double) (Math.round((Double.valueOf(listTotal.get(0).getTotalCount()- item.getNbnormalCount())/Double.valueOf(listTotal.get(0).getTotalCount()))*100)));
                     waterPieDto.setTurbidity(waterPieStateDto2);
                     break;
                 case 11:
                     WaterPieStateDto waterPieStateDto3 = new WaterPieStateDto();
-                    waterPieStateDto3.setNormalCount(item.getTotalCount()- item.getNbnormalCount());
+                    waterPieStateDto3.setNormalCount(listTotal.get(0).getTotalCount()- item.getNbnormalCount());
                     waterPieStateDto3.setNbnormalCount(item.getNbnormalCount());
-                    waterPieStateDto3.setPercentage((double) (Math.round((Double.valueOf(item.getTotalCount()- item.getNbnormalCount())/Double.valueOf(item.getTotalCount()))*100)));
+                    waterPieStateDto3.setPercentage((double) (Math.round((Double.valueOf(listTotal.get(0).getTotalCount()- item.getNbnormalCount())/Double.valueOf(listTotal.get(0).getTotalCount()))*100)));
                     waterPieDto.setResidualChlorine(waterPieStateDto3);
                     break;
             }
         }
-        List<ParmTypeCountDto> listTotal = deviceParmService.findAlarmTotalCount(deviceParmEntity);
-        WaterPieStateDto waterPieStateDto4 = new WaterPieStateDto();
-        waterPieStateDto4.setNormalCount(listTotal.get(0).getTotalCount()- listTotal.get(0).getNbnormalCount());
-        waterPieStateDto4.setNbnormalCount(listTotal.get(0).getNbnormalCount());
-        waterPieStateDto4.setPercentage((double) (Math.round((Double.valueOf(listTotal.get(0).getTotalCount()- listTotal.get(0).getNbnormalCount())/Double.valueOf(listTotal.get(0).getTotalCount()))*100)));
-        waterPieDto.setWaterQuality(waterPieStateDto4);
+
         return waterPieDto;
     }
 }