生成调度概览页数据默认值为0

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

@@ -22,29 +22,29 @@ public class DeviceWaterAmount implements Serializable {
 
     @ApiModelProperty("供水瞬时流量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterSupplyAmountForNow;
+    private BigDecimal waterSupplyAmountForNow = BigDecimal.ZERO;
     @ApiModelProperty("本日供水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterSupplyAmountForDay;
+    private BigDecimal waterSupplyAmountForDay = BigDecimal.ZERO;
     @ApiModelProperty("本月供水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterSupplyAmountForMonth;
+    private BigDecimal waterSupplyAmountForMonth = BigDecimal.ZERO;
     @ApiModelProperty("本年供水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterSupplyAmountForYear;
+    private BigDecimal waterSupplyAmountForYear = BigDecimal.ZERO;
 
     @ApiModelProperty("原水瞬时流量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterIntakeAmountForNow;
+    private BigDecimal waterIntakeAmountForNow = BigDecimal.ZERO;
     @ApiModelProperty("本日原水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterIntakeAmountForDay;
+    private BigDecimal waterIntakeAmountForDay = BigDecimal.ZERO;
     @ApiModelProperty("本月原水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterIntakeAmountForMonth;
+    private BigDecimal waterIntakeAmountForMonth = BigDecimal.ZERO;
     @ApiModelProperty("本年原水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterIntakeAmountForYear;
+    private BigDecimal waterIntakeAmountForYear = BigDecimal.ZERO;
 
     //3供水
     public void addWaterSupplyAmountForNow(BigDecimal amount){

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

@@ -30,7 +30,7 @@ public class DeviceWaterDetail implements Serializable {
     private Integer parmType;
     @ApiModelProperty("值")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal amount;
+    private BigDecimal amount = BigDecimal.ZERO;
     @ApiModelProperty("最后抄表数据")
     private BigDecimal latestValue;
 }

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

@@ -30,7 +30,7 @@ public class DeviceWaterSupply implements Serializable {
     private Integer day;
     @ApiModelProperty("量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal amount;
+    private BigDecimal amount = BigDecimal.ZERO;
     @ApiModelProperty("日期")
     private LocalDate date;
 

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

@@ -23,5 +23,5 @@ public class SceneWaterAmount implements Serializable {
     private String sceneName;
     @ApiModelProperty("水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterAmount;
+    private BigDecimal waterAmount = BigDecimal.ZERO;
 }

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

@@ -22,15 +22,15 @@ public class SceneWaterPressure implements Serializable {
     private static final long serialVersionUID = -2156183545580875355L;
 
     @ApiModelProperty("一级压力数量，<0.15")
-    private Integer pressureLevel1;
+    private Integer pressureLevel1 = 0;
     @ApiModelProperty("一级压力数量，0.15<=0.30")
-    private Integer pressureLevel2;
+    private Integer pressureLevel2 = 0;
     @ApiModelProperty("一级压力数量，0.30<=0.40")
-    private Integer pressureLevel3;
+    private Integer pressureLevel3 = 0;
     @ApiModelProperty("一级压力数量，0.40<=0.50")
-    private Integer pressureLevel4;
+    private Integer pressureLevel4 = 0;
     @ApiModelProperty("一级压力数量，>0.50")
-    private Integer pressureLevel5;
+    private Integer pressureLevel5 = 0;
 
     @ApiModelProperty("各级压力数量")
     private List<Integer> pressureLevels;
@@ -38,21 +38,14 @@ public class SceneWaterPressure implements Serializable {
     private String minPressureSceneName;
     @ApiModelProperty("最小压力值")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal minPressureValue;
+    private BigDecimal minPressureValue = BigDecimal.ZERO;
     @ApiModelProperty("最大压力场景名称")
     private String maxPressureSceneName;
     @ApiModelProperty("最大压力值")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal maxPressureValue;
+    private BigDecimal maxPressureValue = BigDecimal.ZERO;
     @ApiModelProperty("平均压力值")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal avgPressureValue;
+    private BigDecimal avgPressureValue = BigDecimal.ZERO;
 
-    public SceneWaterPressure(){
-        this.pressureLevel1=0;
-        this.pressureLevel2=0;
-        this.pressureLevel3=0;
-        this.pressureLevel4=0;
-        this.pressureLevel5=0;
-    }
 }

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

@@ -31,13 +31,13 @@ public class WaterSupplyChart implements Serializable {
     private String date;
     @ApiModelProperty("制水量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal waterData;
+    private BigDecimal waterData = BigDecimal.ZERO;
     @ApiModelProperty("电耗")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal powerData;
+    private BigDecimal powerData = BigDecimal.ZERO;
     @ApiModelProperty("药耗")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
-    private BigDecimal drugData;
+    private BigDecimal drugData = BigDecimal.ZERO;
 
 
     public WaterSupplyChart (){ }

sms_water/src/main/java/com/huaxu/rabbitmq/ReceiveData.java

@@ -206,11 +206,16 @@ public class ReceiveData {
                            Integer companyOrgId = deviceCheckAlarmDto.getCompanyOrgId();
                            Integer departmentOrgId = deviceCheckAlarmDto.getDeptOrgId();
                            List<Integer> taskUsers = userCenterClient.findUserIdsByPermissonOrg(deviceCheckAlarmDto.getTenantId(),companyOrgId,departmentOrgId);
-                           if(taskUsers!=null){
-                               taskUsers.forEach(id->{
-                                   message.setUserId(id);
-                                   messageSendUtil.send(message);
-                               });
+                           try{
+                               if(taskUsers!=null){
+                                   taskUsers.forEach(id->{
+                                       message.setUserId(id);
+                                       messageSendUtil.send(message);
+                                   });
+                               }
+                           }catch(Exception e){
+                               e.printStackTrace();
+                               log.info("推送报警消息失败:{}",e.getMessage());
                            }
 
                            insert.add(alarmDetailsEntity);

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

@@ -13,6 +13,7 @@ import com.huaxu.service.AlarmDetailsService;
 import com.huaxu.util.DatesUtil;
 import com.huaxu.util.MessageSendUtil;
 import com.huaxu.util.UserUtil;
+import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +28,7 @@ import java.util.stream.Collectors;
  * @data 2020-11-17 15:48
  */
 @Service
+@Log4j2
 public class AlarmDetailsServiceImpl implements AlarmDetailsService {
 
     @Resource
@@ -208,11 +210,16 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
                     Integer companyOrgId = d.getCompanyOrgId();
                     Integer departmentOrgId = d.getDeptOrgId();
                     List<Integer> taskUsers = userCenterClient.findUserIdsByPermissonOrg(d.getTenantId(),companyOrgId,departmentOrgId);
-                    if(taskUsers!=null){
-                        taskUsers.forEach(id->{
-                            message.setUserId(id);
-                            messageSendUtil.send(message);
-                        });
+                    try{
+                        if(taskUsers!=null){
+                            taskUsers.forEach(id->{
+                                message.setUserId(id);
+                                messageSendUtil.send(message);
+                            });
+                        }
+                    }catch(Exception e){
+                        e.printStackTrace();
+                        log.info("推送报警消息失败：{}"+e.getMessage());
                     }
                     return alarmDetailsEntity;
                 })