单位转换为万

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

@@ -143,7 +143,7 @@ public class MonitorDataReportController {
     }
 
     @RequestMapping(value = "sceneAlarms",method = RequestMethod.GET)
-    @ApiOperation(value = "概览首页——供实时报警信息")
+    @ApiOperation(value = "概览首页——供水实时报警信息")
     public AjaxMessage<List<SceneAlarm>> sceneAlarms(){
         return new AjaxMessage<>(ResultStatus.OK,monitorDataReportService.sceneAlarms());
     }

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

@@ -26,7 +26,7 @@ public class WaterSupplyChart implements Serializable {
     private Integer sort;
     @ApiModelProperty("日期")
     private String date;
-    @ApiModelProperty("制水量/取水量")
+    @ApiModelProperty("制水量/取水量/水位")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
     private BigDecimal waterData = BigDecimal.ZERO;
     @ApiModelProperty("电耗")

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

@@ -154,6 +154,17 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         if(monitorDataChartReportDeviceDtos != null){
             FillLoseData(monitorDataChartReportDeviceDtos,type,year,month,day);
         }
+        //单位转换为“万”
+        for(MonitorDataChartReportDeviceDto monitorDataChartReportDeviceDto : monitorDataChartReportDeviceDtos){
+            for(MonitorDataChartReportAttributeDto monitorDataChartReportAttributeDto:monitorDataChartReportDeviceDto.getAttributeData()){
+                monitorDataChartReportAttributeDto.setUnit("万"+monitorDataChartReportAttributeDto.getUnit());
+                for(MonitorDataChartReportValueDto monitorDataChartReportValueDto: monitorDataChartReportAttributeDto.getMonitorDataChartReportValue()){
+                    monitorDataChartReportValueDto.setData(new BigDecimal(monitorDataChartReportValueDto.getData()).divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP).doubleValue());
+                    monitorDataChartReportValueDto.setMonitorData(monitorDataChartReportValueDto.getData()+monitorDataChartReportAttributeDto.getUnit());
+                }
+
+            }
+        }
         return monitorDataChartReportDeviceDtos;
     }
     @Override
@@ -179,6 +190,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         if(monitorDataChartReportDeviceDtos != null){
             FillLoseData(monitorDataChartReportDeviceDtos,type,year,month,day);
         }
+
         return monitorDataChartReportDeviceDtos;
     }
 
@@ -576,7 +588,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         BigDecimal amountCountDay  =  getAmountCount(null,null,"水厂",3,1);
         DeviceWaterSupply deviceWaterSupplyDay = new DeviceWaterSupply();
         deviceWaterSupplyDay.setOrderNo( 1);
-        deviceWaterSupplyDay.setAmount(amountCountDay != null?amountCountDay:BigDecimal.ZERO);
+        deviceWaterSupplyDay.setAmount(amountCountDay != null?amountCountDay.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP):BigDecimal.ZERO);
         deviceWaterSupplyDay.setYear(localDate.getYear());
         deviceWaterSupplyDay.setMonth(localDate.getMonthValue());
         deviceWaterSupplyDay.setDay(localDate.getDayOfMonth());
@@ -909,6 +921,12 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
     @Override
     public List<WaterSupplyChart> waterSupplyCharts(String sceneTypeName) {
 
+        BigDecimal multipleData;
+        if(sceneTypeName.equals("泵站")){
+            multipleData = new BigDecimal("1");
+        }else{
+            multipleData = new BigDecimal("10000");
+        }
         LoginUser loginUser = UserUtil.getCurrentUser();
         String tenantId = loginUser.getTenantId();
 
@@ -923,9 +941,9 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         Period period = Period.between(LocalDate.of(waterSupplyData.getYear(), waterSupplyData.getMonth(), waterSupplyData.getDay()), LocalDate.now());
                         waterSupplyChart.setSort(period.getDays());
                         if (waterSupplyData.getParmType() == 3) { //供水
-                            waterSupplyChart.setWaterData(waterSupplyData.getAmount());
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(multipleData,3, RoundingMode.HALF_UP));
                         } else if (waterSupplyData.getParmType() == 5) {//电耗
-                            waterSupplyChart.setPowerData(waterSupplyData.getAmount());
+                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(multipleData,3, RoundingMode.HALF_UP));
                         } else if (waterSupplyData.getParmType() == 6) {//药耗
                             waterSupplyChart.setDrugData(waterSupplyData.getAmount());
                         }
@@ -963,9 +981,9 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         Period period = Period.between(LocalDate.of(waterSupplyData.getYear(), waterSupplyData.getMonth(), waterSupplyData.getDay()), LocalDate.now());
                         waterSupplyChart.setSort(period.getDays());
                         if (waterSupplyData.getParmType() == 3) { //供水
-                            waterSupplyChart.setWaterData(waterSupplyData.getAmount());
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
                         } else if (waterSupplyData.getParmType() == 5) {//电耗
-                            waterSupplyChart.setPowerData(waterSupplyData.getAmount());
+                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
                         } else if (waterSupplyData.getParmType() == 6) {//药耗
                             waterSupplyChart.setDrugData(waterSupplyData.getAmount());
                         }
@@ -981,8 +999,8 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         BigDecimal powerDataAmountCountMonth = getAmountCount(null,sceneId.intValue(), sceneTypeName, 5,1 );
         WaterSupplyChart waterSupplyChart= new WaterSupplyChart();
         waterSupplyChart.setDate(LocalDate.now().getYear()+"-"+LocalDate.now().getMonthValue()+"-"+LocalDate.now().getDayOfMonth());
-        waterSupplyChart.setWaterData(waterDataAmountCountMonth);
-        waterSupplyChart.setPowerData(powerDataAmountCountMonth);
+        waterSupplyChart.setWaterData(waterDataAmountCountMonth.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
+        waterSupplyChart.setPowerData(powerDataAmountCountMonth.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
         waterSupplyChart.setSort(0);
         waterSupplyCharts.add(waterSupplyChart);
         return waterSupplyCharts;

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -963,7 +963,7 @@
     <select id="getDeviceWaterFor30Day" resultType="com.huaxu.dto.generalView.DeviceWaterSupply">
          select
               r.year,r.month,r.day,
-            sum(r.SUM_VALUE) as "amount"
+            sum(r.SUM_VALUE)/10000 as "amount"
         from sms_scene_type st
         left join sms_scene s on s.SCENE_TYPE_ID =st.id
         left join sms_device_parm dp on s.id=dp.PARENT_SCENE_ID
@@ -1301,7 +1301,7 @@
             ,r.month
             ,r.day
             ,dp.PARM_TYPE as "parmType"
-            ,sum(r.SUM_VALUE)/10000 as "amount"
+            ,sum(r.SUM_VALUE) as "amount"
             ,da.UNIT as "unit"
         from sms_scene_type st
         left join sms_scene s on s.SCENE_TYPE_ID =st.id