泵站水质合格率

sms_water/src/main/java/com/huaxu/controller/HomePageReportController.java

@@ -108,6 +108,13 @@ public class HomePageReportController {
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.waterQualityRateForWaterFactory(sceneId));
     }
 
+    @RequestMapping(value = "waterQualityRateForPumpingStation",method = RequestMethod.GET)
+    @ApiOperation(value = "综合展示——泵站水质")
+    public AjaxMessage<WaterQualityRateForScene> waterQualityRateForPumpingStation(
+            @ApiParam(value = "泵站id",required = true) @RequestParam Integer sceneId){
+        return new AjaxMessage<>(ResultStatus.OK,homePageReportService.waterQualityRateForPumpingStation(sceneId));
+    }
+
     @RequestMapping(value = "waterEnergyConsumptionForWaterFactory",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——水厂能耗")
     public AjaxMessage<List<WaterSupplyChart>> waterEnergyConsumptionForWaterFactory(

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

@@ -40,9 +40,10 @@ public interface HomePageReportService {
     WaterQualityRateForScene waterQualityRateForWaterSource(Integer sceneId);
 
 
-
     //水厂水质合格率
     WaterQualityRateForScene waterQualityRateForWaterFactory(Integer sceneId);
+    //泵站水质合格率
+    WaterQualityRateForScene waterQualityRateForPumpingStation(Integer sceneId);
 
     //泵站能耗分析
     //水厂能耗分析

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

@@ -262,6 +262,31 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         return waterQualityRateForScene;
     }
 
+    @Override
+    public WaterQualityRateForScene waterQualityRateForPumpingStation(Integer sceneId) {
+
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        //余氯
+        BigDecimal chlorine =  homePageReportMapper.getWaterQualificationForScene(11,sceneId,"泵站",
+                loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+        //浊度
+        BigDecimal turbidity =  homePageReportMapper.getWaterQualificationForScene(10,sceneId,"泵站",
+                loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+        //PH
+        BigDecimal ph =  homePageReportMapper.getWaterQualificationForScene(8,sceneId,"泵站",
+                loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+        //压力
+        BigDecimal pressure =  homePageReportMapper.getWaterQualificationForScene(13,sceneId,"泵站",
+                loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+
+        WaterQualityRateForScene waterQualityRateForScene = new WaterQualityRateForScene();
+        waterQualityRateForScene.setChlorine(chlorine!=null?chlorine:BigDecimal.ZERO);
+        waterQualityRateForScene.setTurbidity(turbidity!=null?turbidity:BigDecimal.ZERO);
+        waterQualityRateForScene.setPh(ph!=null?ph:BigDecimal.ZERO);
+        waterQualityRateForScene.setPressure(pressure!=null?pressure:BigDecimal.ZERO);
+        return waterQualityRateForScene;
+    }
+
     @Override
     public WaterQualityRateForScene waterQualityRateForWaterFactory(Integer sceneId) {
 
@@ -286,8 +311,6 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         waterQualityRateForScene.setPressure(pressure!=null?pressure:BigDecimal.ZERO);
         return waterQualityRateForScene;
     }
-
-
     //水厂制水、药耗、电耗对比曲线
     @Override
     public List<WaterSupplyChart> waterEnergyConsumption( Integer sceneId,String sceneType) {