综合水质修改

sms_water/src/main/java/com/huaxu/dto/homePage/WaterQualityRate.java

@@ -36,13 +36,26 @@ public class WaterQualityRate {
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
     private BigDecimal pipeNetworkQuality;
 
+    @ApiModelProperty("水源异常数量")
+    private Integer waterSourceAbnormal;
+    @ApiModelProperty("水厂异常数量")
+    private Integer waterFactoryAbnormal;
+    @ApiModelProperty("泵站异常数量")
+    private Integer pumpingStationAbnormal;
+    @ApiModelProperty("管网异常数量")
+    private Integer pipeNetworkAbnormal;
+
     public WaterQualityRate(){
         this.abnormal=0;
-        this.averageQuality=BigDecimal.ZERO;
-        this.waterSourceQuality=BigDecimal.ZERO;
-        this.waterFactoryQuality=BigDecimal.ZERO;
-        this.pumpingStationQuality=BigDecimal.ZERO;
-        this.pipeNetworkQuality=BigDecimal.ZERO;
+        this.waterSourceAbnormal=0;
+        this.waterFactoryAbnormal=0;
+        this.pumpingStationAbnormal=0;
+        this.pipeNetworkAbnormal=0;
+        this.averageQuality=new BigDecimal("100");
+        this.waterSourceQuality=new BigDecimal("100");
+        this.waterFactoryQuality=new BigDecimal("100");
+        this.pumpingStationQuality=new BigDecimal("100");
+        this.pipeNetworkQuality=new BigDecimal("100");
     }
 
 }

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

@@ -189,21 +189,25 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         if(pipeNetworkQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+pipeNetworkQuality.getAbnormal());
             waterQualityRate.setPipeNetworkQuality(pipeNetworkQuality.getAverageQuality());
-            waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(pipeNetworkQuality.getAverageQuality()));
+            waterQualityRate.setPipeNetworkAbnormal(pipeNetworkQuality.getAbnormal());
+            waterQualityRate.setAverageQuality(pipeNetworkQuality.getAverageQuality());
         }
         if(waterSourceQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+waterSourceQuality.getAbnormal());
             waterQualityRate.setWaterSourceQuality(waterSourceQuality.getAverageQuality());
+            waterQualityRate.setWaterSourceAbnormal(waterQualityRate.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(waterSourceQuality.getAverageQuality()));
         }
         if(waterFactoryQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+waterFactoryQuality.getAbnormal());
             waterQualityRate.setWaterFactoryQuality(waterFactoryQuality.getAverageQuality());
+            waterQualityRate.setWaterFactoryAbnormal(waterFactoryQuality.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(waterFactoryQuality.getAverageQuality()));
         }
         if(pumpingStationQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+pumpingStationQuality.getAbnormal());
             waterQualityRate.setPumpingStationQuality(pumpingStationQuality.getAverageQuality());
+            waterQualityRate.setPumpingStationAbnormal(pumpingStationQuality.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(pumpingStationQuality.getAverageQuality()));
         }
         waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().divide(new BigDecimal("4"),3,BigDecimal.ROUND_HALF_UP));