故障监控信息表增加monitorId

device-api-service/src/main/java/com/xy/entity/DeviceFaultInfo.java

@@ -36,6 +36,9 @@ public class DeviceFaultInfo implements Serializable {
     @ApiModelProperty(value = "商户ID")
     private Long mercId;
 
+    @ApiModelProperty(value = "监控ID")
+    private Long monitorId;
+
     @ApiModelProperty(value = "设备编号")
     private Long deviceId;
 

device-api-service/src/main/java/com/xy/service/DeviceMqttConsumerImpl.java

@@ -229,10 +229,9 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                     .collect(Collectors.toList());
             for (DeviceFaultMonitorConfigDto.Vo config : configSortedList) {
                 Integer eventNum = config.getEventNum();
-
                 Long minuteNum = config.getMinuteNum();
-
                 Integer faultLevel = config.getFaultLevel();
+                Long monitorId = config.getMonitorId();
 
                 // 获取当前时间
                 Date now = DateUtil.date();
@@ -265,7 +264,8 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                             deviceInfoService.updateById(new DeviceInfo().setDeviceId(deviceId).setFaultLevel(faultLevel));
                         }
                         //累加次数
-                        deviceFaultInfo.setEventNum(deviceFaultInfo.getEventNum() + 1);
+                        deviceFaultInfo.setEventNum(deviceFaultInfo.getEventNum() + 1).setMonitorId(monitorId);
+
                         deviceFaultInfoService.updateById(deviceFaultInfo);
                     } else {
                         deviceFaultInfoService.save(new DeviceFaultInfo()
@@ -275,6 +275,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                                 .setFaultLevel(faultLevel)
                                 .setEventCode(code)
                                 .setEventNum(count.intValue())
+                                .setMonitorId(monitorId)
                         );
                         deviceInfoService.updateById(new DeviceInfo().setDeviceId(deviceId).setFaultLevel(faultLevel));
                     }

device-api/src/main/java/com/xy/dto/DeviceFaultInfoDto.java

@@ -96,6 +96,9 @@ public class DeviceFaultInfoDto {
         @ApiModelProperty(value = "故障级别-字典：device_fault_level")
         private Integer faultLevel;
 
+        @ApiModelProperty(value = "监控ID")
+        private Long monitorId;
+
 
     }