场景修改

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

@@ -922,15 +922,15 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
     public List<WaterSupplyChart> waterSupplyCharts(String sceneTypeName) {
 
         BigDecimal multipleData;
-        if(sceneTypeName.equals("泵站")){
+        if (sceneTypeName.equals("泵站")) {
             multipleData = new BigDecimal("1");
-        }else{
+        } else {
             multipleData = new BigDecimal("10000");
         }
         LoginUser loginUser = UserUtil.getCurrentUser();
         String tenantId = loginUser.getTenantId();
 
-        List<WaterSupplyData> waterSupplyDatas = monitorDataReportMapper.getWaterSupplyData(tenantId,sceneTypeName,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+        List<WaterSupplyData> waterSupplyDatas = monitorDataReportMapper.getWaterSupplyData(tenantId, sceneTypeName, loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
         List<WaterSupplyChart> waterSupplyCharts = new ArrayList<>();
         waterSupplyDatas.stream()
                 .collect(Collectors.groupingBy(item -> item.getYear() + "-" + item.getMonth() + "-" + item.getDay()))
@@ -940,11 +940,11 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                     value.stream().forEach(waterSupplyData -> {
                         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().divide(multipleData,3, RoundingMode.HALF_UP));
-                        } else if (waterSupplyData.getParmType() == 5) {//电耗
-                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(multipleData,3, RoundingMode.HALF_UP));
-                        } else if (waterSupplyData.getParmType() == 6) {//药耗
+                        if (waterSupplyData.getParmType() == 3 && waterSupplyData.getAmount() != null) { //供水
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(multipleData, 3, RoundingMode.HALF_UP));
+                        } else if (waterSupplyData.getParmType() == 5 && waterSupplyData.getAmount() != null) {//电耗
+                            waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(multipleData, 3, RoundingMode.HALF_UP));
+                        } else if (waterSupplyData.getParmType() == 6 && waterSupplyData.getAmount() != null) {//药耗
                             waterSupplyChart.setDrugData(waterSupplyData.getAmount());
                         }
                     });
@@ -952,9 +952,9 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                 });
 
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort));
-        for(int i=0;i<7;i++){
-            if(i == waterSupplyCharts.size() || !waterSupplyCharts.get(i).getSort().equals(i+1)){
-                waterSupplyCharts.add(i,new WaterSupplyChart(i+1));
+        for (int i = 0; i < 7; i++) {
+            if (i == waterSupplyCharts.size() || !waterSupplyCharts.get(i).getSort().equals(i + 1)) {
+                waterSupplyCharts.add(i, new WaterSupplyChart(i + 1));
             }
         }
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort).reversed());