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 colTime; + + private List acqTime; + + private Double airFlow; + + private Double decayTime; + + private Double sampVol; + + private Double ba140MDC; + + private Double be7FWHM; + + private List 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 conditionChecked = ListUtil .toList(analysisRule.getConditions().split(comma)); analysisRuleInfo.setConditionChecked(conditionChecked); + + List colTimes = ListUtil + .toList(analysisRule.getColTime().split(comma)); + analysisRuleInfo.setColTime(colTimes); + + List acqTimes = ListUtil + .toList(analysisRule.getAcqTime().split(comma)); + analysisRuleInfo.setColTime(acqTimes); + + List xe133MDC = ListUtil + .toList(analysisRule.getXe133MDC().split(comma)); + analysisRuleInfo.setColTime(xe133MDC); return Result.OK(analysisRuleInfo); }