添加消息

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/entity/DataAlarmDetailEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.bz.zoneiot.core.utils.encrypt.Md5;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.Date;
  **/
 @Data
 @TableName("sms_data_alarm_detail")
+@ToString
 public class DataAlarmDetailEntity extends DataAlarmSetting {
 
     @ApiModelProperty(value = "报警管理ID")

zoniot-water/zoniot-water-xxl-client/src/main/java/com/bz/zoneiot/water/xxl/service/AbstractDataAlarmJobService.java

@@ -65,9 +65,10 @@ public abstract class AbstractDataAlarmJobService {
     public void execute(){
         List<DataAlarmManageVo> manageVoList = this.listDataAlarmManage();
         if (CollectionUtils.isEmpty(manageVoList)) {
-            log.info("获取数据报警管理参数数据为空");
+            log.info("【数据报警】获取数据报警管理参数数据为空");
             return;
         }
+        log.info("【数据报警】获取数据报警管理参数数据条数:{}", manageVoList.size());
         DataAlarmManageEntity manageEntity;
         DataAlarmDetailEntity nowDetailEntity;
         Map<Long, DataAlarmDetailEntity> alarmDetailsDtoMap = getMapDataAlarmDetail(manageVoList);
@@ -76,10 +77,12 @@ public abstract class AbstractDataAlarmJobService {
             BeanUtils.copyProperties(manageVo, manageEntity);
             nowDetailEntity = this.getAlarmValue(manageEntity);
             if (nowDetailEntity == null) {
+                log.info("【数据报警】获取[{}]数据报警值为空，进行过滤。",manageEntity.getAlarmName());
                 continue;
             }
             nowDetailEntity.setManageId(manageEntity.getId());
             boolean isAlarm = isAlarm(nowDetailEntity, manageEntity);
+            log.info("【数据报警】获取[{}]数据报警值为空，是否触发报警[{}]",manageEntity.getAlarmName(), isAlarm);
             // 必须先计算报警数据，才能执行保存数据报警分析操作，不然会丢失数据
             this.saveDataAlarmAnalysis(nowDetailEntity);
             // 计算出来属于报警，处理报警数据

zoniot-water/zoniot-water-xxl-client/src/main/resources/bootstrap-dev.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: zoniot-water-xxljob-client
+    name: zoniot-water-xxl-client
   profiles:
     active: dev
   cloud:
@@ -8,7 +8,7 @@ spring:
       config:
         namespace: 73da6876-408b-4850-9ef9-cd2c4ea831bf
         server-addr: 127.0.0.1:8848
-        prefix: zoniot-water-xxljob-client
+        prefix: zoniot-water-xxl-client
         file-extension: properties
   main:
     allow-bean-definition-overriding: true