From 91bcec7aea4940c4a4f558bc4dbce7b30ab01429 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 2 Jan 2025 14:57:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B8=E7=B4=A0=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=A2=9E=E5=8A=A0QC=20=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/dto/AlarmAnalysisRuleInfo.java       | 26 +++++++++++++++++++
 .../impl/AlarmAnalysisRuleServiceImpl.java    | 12 +++++++++
 2 files changed, 38 insertions(+)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
index c00023bf..370a6625 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
@@ -27,4 +27,30 @@ public class AlarmAnalysisRuleInfo implements Serializable {
     private String contactGroup;
 
     private String remark;
+
+    private List<String> colTime;
+
+    private List<String> acqTime;
+
+    private Double airFlow;
+
+    private Double decayTime;
+
+    private Double sampVol;
+
+    private Double ba140MDC;
+
+    private Double be7FWHM;
+
+    private List<String> xe133MDC;
+
+    private Double xeVol;
+
+    private Integer xe131mFlag;
+
+    private Integer xe133mFlag;
+
+    private Integer xe133Flag;
+
+    private Integer xe135Flag;
 }
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java
index e7d5fb5e..77cadf77 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java
@@ -183,6 +183,18 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl<AlarmAnalysisRuleM
         List<String> conditionChecked = ListUtil
                 .toList(analysisRule.getConditions().split(comma));
         analysisRuleInfo.setConditionChecked(conditionChecked);
+
+        List<String> colTimes = ListUtil
+                .toList(analysisRule.getColTime().split(comma));
+        analysisRuleInfo.setColTime(colTimes);
+
+        List<String> acqTimes = ListUtil
+                .toList(analysisRule.getAcqTime().split(comma));
+        analysisRuleInfo.setColTime(acqTimes);
+
+        List<String> xe133MDC = ListUtil
+                .toList(analysisRule.getXe133MDC().split(comma));
+        analysisRuleInfo.setColTime(xe133MDC);
         return Result.OK(analysisRuleInfo);
     }