Parcourir la source

综合调度返回cod

wangyangyang il y a 4 ans
Parent
commit
adba06b766

+ 3 - 0
sms_water/src/main/java/com/huaxu/dto/homePage/WaterQualityRateForScene.java

@@ -23,6 +23,9 @@ public class WaterQualityRateForScene {
     @ApiModelProperty("浊度")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
     private BigDecimal turbidity;
+    @ApiModelProperty("COD")
+    @JsonSerialize(using = BigDecimalJsonSerializer.class)
+    private BigDecimal cod;
     @ApiModelProperty("PH")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
     private BigDecimal ph;

+ 4 - 0
sms_water/src/main/java/com/huaxu/service/impl/HomePageReportServiceImpl.java

@@ -348,6 +348,9 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         //PH
         BigDecimal ph = homePageReportMapper.getWaterQualificationByMonth(localDate, 8, sceneId, "水厂",
                 loginUser.getTenantId(), loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
+        //COD
+        BigDecimal cod = homePageReportMapper.getWaterQualificationByMonth(localDate, 15, sceneId, "水厂",
+                loginUser.getTenantId(), loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
         //压力
         BigDecimal pressure = homePageReportMapper.getWaterQualificationByMonth(localDate, 13, sceneId, "水厂",
                 loginUser.getTenantId(), loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
@@ -355,6 +358,7 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         WaterQualityRateForScene waterQualityRateForScene = new WaterQualityRateForScene();
         waterQualityRateForScene.setChlorine(chlorine != null ? chlorine : new BigDecimal("100"));
         waterQualityRateForScene.setTurbidity(turbidity != null ? turbidity : new BigDecimal("100"));
+        waterQualityRateForScene.setCod(cod != null ? cod : new BigDecimal("100"));
         waterQualityRateForScene.setPh(ph != null ? ph : new BigDecimal("100"));
         waterQualityRateForScene.setPressure(pressure != null ? pressure : new BigDecimal("100"));
         return waterQualityRateForScene;