修改综合展示bug

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

@@ -87,16 +87,21 @@ public class MonitorInfoController {
         SceneUsageDto sceneUsageDto = new SceneUsageDto();
 
         //查询场景下的所有设备信息
-        sceneUsageDto.setYieldWaterUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 3, 1).doubleValue());
-        sceneUsageDto.setIntakeWaterUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 4, 1).doubleValue());
-        sceneUsageDto.setPowerUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 5, 1).doubleValue());
-        sceneUsageDto.setDrugUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 6, 1).doubleValue());
+        BigDecimal amount1 = monitorDataReportService.getAmountCount(null, id.intValue(), null, 3, 1);
+        sceneUsageDto.setYieldWaterUsage(amount1 != null ? amount1.doubleValue() : 0);
+
+        BigDecimal amount2 = monitorDataReportService.getAmountCount(null, id.intValue(), null, 4, 1);
+        sceneUsageDto.setIntakeWaterUsage(amount2 != null ? amount2.doubleValue() : 0);
+        BigDecimal amount3 = monitorDataReportService.getAmountCount(null, id.intValue(), null, 5, 1);
+        sceneUsageDto.setPowerUsage(amount3 != null ? amount3.doubleValue() : 0);
+        BigDecimal amount4 = monitorDataReportService.getAmountCount(null, id.intValue(), null, 6, 1);
+        sceneUsageDto.setDrugUsage(amount4 != null ? amount4.doubleValue() : 0);
         sceneUsageDto.setCollectDate(monitorDataReportService.getLastCollectTime(null, id.intValue(), null, 3, 1));
         if (type.equals(1) || type.equals(0)) {
             sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getYieldWaterUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
             sceneUsageDto.setIntakeWaterUsage(sceneUsageDto.getIntakeWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getIntakeWaterUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
             sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getPowerUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
-            sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).setScale( 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
+            sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
         } else {
             sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getYieldWaterUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
             sceneUsageDto.setIntakeWaterUsage(sceneUsageDto.getIntakeWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getIntakeWaterUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);