标签值修改

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

@@ -113,23 +113,18 @@ public class MonitorInfoController {
                 }
                 if (sceneUsageDto.getYieldWaterUsage() == null)
                     sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage());
-                else if (type != null && type.length > 0) {
-                    sceneUsageDto.setYieldWaterUsage(BigDecimal.valueOf(sceneUsageDto.getYieldWaterUsage()).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-                }
                 if (sceneUsageDto.getIntakeWaterUsage() == null)
                     sceneUsageDto.setIntakeWaterUsage(sceneUsageDto.getIntakeWaterUsage());
-                else if (type != null && type.length > 0) {
-                    sceneUsageDto.setIntakeWaterUsage(BigDecimal.valueOf(sceneUsageDto.getIntakeWaterUsage()).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-                }
                 if (sceneUsageDto.getPowerUsage() == null)
                     sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage());
-                else if (type != null && type.length > 0) {
-                    sceneUsageDto.setPowerUsage(BigDecimal.valueOf(sceneUsageDto.getPowerUsage()).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-                }
                 if (sceneUsageDto.getDrugUsage() == null)
                     sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage());
-                else if (type != null && type.length > 0) {
-                    sceneUsageDto.setDrugUsage(BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+                if (type != null && type.length > 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()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
                 }
             }
         }