单位转换

sms_water/src/main/java/com/huaxu/dto/generalView/DeviceWaterSupply.java

@@ -52,8 +52,8 @@ public class DeviceWaterSupply implements Serializable {
     private String dateLabel;
 
 
-    public void amountConvert(){
-        this.amount =this.amount.divide(new BigDecimal(10000));
+    public void amountConvert( BigDecimal multipleData){
+        this.amount =this.amount.divide(multipleData);
     }
 
 }

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

@@ -34,7 +34,7 @@ public interface HomePageReportService {
 
     //水库取水15天
     //水库水位15天
-    //水厂制水15天
+    //水厂泵站制水15天
     // 水厂 3 水源 4 水位 12
     List<DeviceWaterSupply> monitorDataFifteenDays(Integer sceneId, String sceneType, Integer parmType);
 

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

@@ -109,8 +109,8 @@ public class AppReportMonitorServiceImpl  implements AppReportMonitorService {
         WaterSupplyChart waterSupplyChartToday = new WaterSupplyChart();
         waterSupplyChartToday.setSort(localDate.getDayOfMonth());
         waterSupplyChartToday.setDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(localDate));
-        waterSupplyChartToday.setWaterData(waterDataCountDay);
-        waterSupplyChartToday.setPowerData(powerDataCountDay);
+        waterSupplyChartToday.setWaterData(waterDataCountDay.divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
+        waterSupplyChartToday.setPowerData(powerDataCountDay.divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
 //        waterSupplyChartToday.setDrugData(drugDataCountDay);
 
 
@@ -125,9 +125,9 @@ public class AppReportMonitorServiceImpl  implements AppReportMonitorService {
                         waterSupplyChart.setSort(waterSupplyData.getDay());
 
                         if (waterSupplyData.getParmType() == 3) { //供水
-                            waterSupplyChart.setWaterData(waterSupplyData.getAmount());
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
                         } else if (waterSupplyData.getParmType() == 5) {//电耗
-                            waterSupplyChart.setPowerData(waterSupplyData.getAmount());
+                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
                         }
 //                        else if (waterSupplyData.getParmType() == 6) {//药耗
 //                            waterSupplyChart.setDrugData(waterSupplyData.getAmount());

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

@@ -213,14 +213,19 @@ public class HomePageReportServiceImpl implements HomePageReportService {
 
 
     /**
-     * 水厂 3 水源 4 水位 12
+     * 水厂泵站 3 水源 4 水位 12
      * @return
      */
     @Override
     public List<DeviceWaterSupply> monitorDataFifteenDays(Integer sceneId, String sceneType, Integer parmType) {
+        BigDecimal multipleData;
+        if(sceneType.equals("泵站")){
+            multipleData = new BigDecimal("1");
+        }else{
+            multipleData = new BigDecimal("10000");
+        }
         LoginUser loginUser = UserUtil.getCurrentUser();
 
-
         List<DeviceWaterSupply> deviceWaterSupplies = homePageReportMapper.getMonitorDataFifteenDays( sceneId, sceneType, parmType,
                 loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
 
@@ -254,7 +259,7 @@ public class HomePageReportServiceImpl implements HomePageReportService {
             } else {
                 deviceWaterSupplies.get(i).setOrderNo(i + 1);
                 if(parmType != 12 ){ //不是水位就除以1000 转化为万
-                    deviceWaterSupplies.get(i).amountConvert();
+                    deviceWaterSupplies.get(i).amountConvert(multipleData);
                 }
                 deviceWaterSupplies.get(i).setDate(newLocalDate);
             }
@@ -342,9 +347,15 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         waterQualityRateForScene.setPressure(pressure!=null?pressure:new BigDecimal("100"));
         return waterQualityRateForScene;
     }
-    //水厂制水、药耗、电耗对比曲线
+    //制水、药耗、电耗对比曲线
     @Override
     public List<WaterSupplyChart> waterEnergyConsumption( Integer sceneId,String sceneType) {
+        BigDecimal multipleData;
+        if(sceneType.equals("泵站")){
+            multipleData = new BigDecimal("1");
+        }else{
+            multipleData = new BigDecimal("10000");
+        }
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         String tenantId = loginUser.getTenantId();
@@ -359,8 +370,8 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         WaterSupplyChart waterSupplyChartToday = new WaterSupplyChart();
         waterSupplyChartToday.setSort(localDate.getDayOfMonth());
         waterSupplyChartToday.setDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(localDate));
-        waterSupplyChartToday.setWaterData(waterDataCountDay.divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
-        waterSupplyChartToday.setPowerData(powerDataCountDay);
+        waterSupplyChartToday.setWaterData(waterDataCountDay.divide(multipleData,3,BigDecimal.ROUND_HALF_UP));
+        waterSupplyChartToday.setPowerData(powerDataCountDay.divide(multipleData,3,BigDecimal.ROUND_HALF_UP));
         waterSupplyChartToday.setDrugData(drugDataCountDay);
 
 
@@ -375,9 +386,9 @@ public class HomePageReportServiceImpl implements HomePageReportService {
                         waterSupplyChart.setSort(waterSupplyData.getDay());
 
                         if (waterSupplyData.getParmType() == 3) { //供水
-                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(multipleData,3,BigDecimal.ROUND_HALF_UP));
                         } else if (waterSupplyData.getParmType() == 5) {//电耗
-                            waterSupplyChart.setPowerData(waterSupplyData.getAmount());
+                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(multipleData,3,BigDecimal.ROUND_HALF_UP));
                         } else if (waterSupplyData.getParmType() == 6) {//药耗
                             waterSupplyChart.setDrugData(waterSupplyData.getAmount());
                         }