二供统计

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

@@ -157,7 +157,7 @@ public class MonitorDataReportController {
     @RequestMapping(value = "sceneWaterPressure",method = RequestMethod.GET)
     @ApiOperation(value = "概览首页——压力分布区间")
     public AjaxMessage<SceneWaterPressure> sceneWaterPressure(){
-        return new AjaxMessage<>(ResultStatus.OK,monitorDataReportService.sceneWaterPressure());
+        return new AjaxMessage<>(ResultStatus.OK,monitorDataReportService.sceneWaterPressure("水厂"));
     }
 
     @RequestMapping(value = "sceneWaterAmounts",method = RequestMethod.GET)

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

@@ -3,10 +3,12 @@ package com.huaxu.controller;
 import com.huaxu.dto.AmountDayThirtyDto;
 import com.huaxu.dto.AmountTotalDto;
 import com.huaxu.dto.WaterPieDto;
+import com.huaxu.dto.generalView.SceneWaterPressure;
 import com.huaxu.entity.MonthReportEntity;
 import com.huaxu.entity.SceneEntity;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.service.MonitorDataReportService;
 import com.huaxu.service.MonthReportService;
 import com.huaxu.service.SceneService;
 import com.huaxu.service.SecSupplyService;
@@ -26,9 +28,11 @@ import java.util.*;
 public class SecSupplyController {
     @Autowired
     private SecSupplyService secSupplyService;
+    @Autowired
+    private MonitorDataReportService monitorDataReportService;
 
 
-    @ApiOperation(value = "近30天供水量",notes = "sceneType 1为水源2水厂3泵站")
+    @ApiOperation(value = "二供概览首页——近30天供水量",notes = "sceneType 1为水源2水厂3泵站")
     @RequestMapping(value = "/selectAmountByTypeName", method = RequestMethod.GET)
     @ResponseBody
     public AjaxMessage<List<AmountDayThirtyDto>> findAmountDayThirty(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
@@ -42,7 +46,7 @@ public class SecSupplyController {
         List<AmountDayThirtyDto> list = secSupplyService.getAmountDayThirty(sceneEntity);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
-    @ApiOperation(value = "查询供水量汇总信息",notes = "sceneType 1为水源 2水厂 3泵站")
+    @ApiOperation(value = "二供概览首页——查询供水量汇总信息",notes = "sceneType 1为水源 2水厂 3泵站")
     @RequestMapping(value = "/selectAmountTotalByTypeName", method = RequestMethod.GET)
     @ResponseBody
     public AjaxMessage<AmountTotalDto> findAmountTotalByTypeName(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
@@ -57,7 +61,7 @@ public class SecSupplyController {
         amountTotalDto = secSupplyService.findAmountTotalByTypeName(sceneEntity);
         return new AjaxMessage<>(ResultStatus.OK, amountTotalDto);
     }
-    @ApiOperation(value = "查询管网水质情况",notes = "sceneType 1为水源 2水厂 3泵站")
+    @ApiOperation(value = "二供概览首页——查询管网水质情况",notes = "sceneType 1为水源 2水厂 3泵站")
     @RequestMapping(value = "/selectWaterQualityByTypeName", method = RequestMethod.GET)
     @ResponseBody
     public  AjaxMessage<WaterPieDto> selectWaterQualityByTypeName(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
@@ -72,5 +76,11 @@ public class SecSupplyController {
         return new AjaxMessage<>(ResultStatus.OK, waterPieDto);
     }
 
+    @RequestMapping(value = "sceneWaterPressure",method = RequestMethod.GET)
+    @ApiOperation(value = "二供概览首页——压力分布区间")
+    public AjaxMessage<SceneWaterPressure> sceneWaterPressure(){
+        return new AjaxMessage<>(ResultStatus.OK,monitorDataReportService.sceneWaterPressure("泵站"));
+    }
+
 
 }

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

@@ -49,7 +49,7 @@ public interface MonitorDataReportService {
     List<SceneNormalRate> SceneNormalRates();
 
     //压力分布区间
-    SceneWaterPressure sceneWaterPressure();
+    SceneWaterPressure sceneWaterPressure(String sceneType);
 
     //水量排行
     List<SceneWaterAmount> sceneWaterAmounts();

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

@@ -731,13 +731,13 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
 
     //压力分布
     @Override
-    public SceneWaterPressure sceneWaterPressure() {
+    public SceneWaterPressure sceneWaterPressure(String sceneType) {
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         String tenantId = loginUser.getTenantId();
         Map<Integer, MonitorDataEntity> MonitorDataMap = getIntegerMonitorDataEntityMap(tenantId);
 
-        List<DeviceWaterDetail> devicePressureWaterDetailsForNow = monitorDataReportMapper.getDeviceWaterDetailForNow("水厂", 13, tenantId);
+        List<DeviceWaterDetail> devicePressureWaterDetailsForNow = monitorDataReportMapper.getDeviceWaterDetailForNow(sceneType, 13, tenantId);
 
         List<SceneWaterAmount> sceneWaterPressureAmounts = new ArrayList<>();