1、修复报警记录生成；

mh-common/src/main/java/com/mh/common/model/request/AdvantechDatas.java

@@ -22,4 +22,9 @@ public class AdvantechDatas<T extends Number> {
      */
     private T value;
 
+    /**
+     * 质量值
+     */
+    private T quality;
+
 }

mh-system/src/main/java/com/mh/system/service/operation/IAlarmCodeService.java

@@ -22,5 +22,5 @@ public interface IAlarmCodeService {
 
     int deleteAlarmCodeByIds(String[] acIds);
 
-    AlarmCode selectAlarmCodeByAlarmType(String eventType);
+    List<AlarmCode> selectAlarmCodeByAlarmType(String eventType);
 }

mh-system/src/main/java/com/mh/system/service/operation/impl/AlarmCodeServiceImpl.java

@@ -85,12 +85,13 @@ public class AlarmCodeServiceImpl implements IAlarmCodeService {
     }
 
     @Override
-    public AlarmCode selectAlarmCodeByAlarmType(String eventType) {
+    public List<AlarmCode> selectAlarmCodeByAlarmType(String eventType) {
         if (StringUtils.isEmpty(eventType)) {
             return null;
         }
         QueryWrapper<AlarmCode> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("event_type", eventType);
-        return alarmCodeMapper.selectOne(queryWrapper);
+        List<AlarmCode> alarmCodes = alarmCodeMapper.selectList(queryWrapper);
+        return alarmCodes;
     }
 }

mh-system/src/main/java/com/mh/system/service/operation/impl/AlarmRecordsServiceImpl.java

@@ -176,7 +176,11 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
             if ("0".equals(alarmRule.getAlarmType())) {
                 // 当前是越限事件
                 // 查询事件类型查询对应的报警模板内容
-                AlarmCode alarmCode = alarmCodeService.selectAlarmCodeByAlarmType(alarmRule.getEventType());
+                List<AlarmCode> alarmCodes = alarmCodeService.selectAlarmCodeByAlarmType(alarmRule.getEventType());
+                if (alarmCodes == null || alarmCodes.isEmpty()) {
+                    continue;
+                }
+                for (AlarmCode alarmCode : alarmCodes) {
                     // 获取当前采集参数值
                     CollectionParamsManage collectionParamsManage = collectionParamsManageService.selectCollectionParamsManageById(alarmRule.getCpmId());
                     // 判断当前值是否是当前事件
@@ -204,6 +208,7 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
                 }
             }
         }
+    }
 
     @Override
     public String createAlarmTask() {
@@ -241,7 +246,13 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
                             "true",
                             2, TimeUnit.MINUTES  // 例如：延迟5分钟，设置10分钟过期
                     );
-                    insertOrUpdateRecord(alarmRule, curValue, threshold1, threshold2, alarmCodeService.selectAlarmCodeByAlarmType(alarmRule.getEventType()), alarmRecords, collectionParamsManage);
+                    List<AlarmCode> alarmCode = alarmCodeService.selectAlarmCodeByAlarmType(alarmRule.getEventType());
+                    if (alarmCode == null || alarmCode.isEmpty()) {
+                        continue;
+                    }
+                    for (AlarmCode code : alarmCode) {
+                        insertOrUpdateRecord(alarmRule, curValue, threshold1, threshold2, code, alarmRecords, collectionParamsManage);
+                    }
                 }
             }
         }