diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java index 9c7262a8..e871cdb5 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java @@ -1,5 +1,6 @@ package org.jeecg.modules.base.entity.postgre; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @@ -43,38 +44,43 @@ public class AlarmAnalysisRule extends JeecgEntity { private Integer coefficient; + @TableField(updateStrategy = FieldStrategy.IGNORED) private String colTime; + @TableField(updateStrategy = FieldStrategy.IGNORED) private String acqTime; + @TableField(updateStrategy = FieldStrategy.IGNORED) private Double airFlow; + @TableField(updateStrategy = FieldStrategy.IGNORED) private Double decayTime; + @TableField(updateStrategy = FieldStrategy.IGNORED) private Double sampVol; - @TableField("ba140_mdc") + @TableField(value = "ba140_mdc", updateStrategy = FieldStrategy.IGNORED) private Double ba140MDC; - @TableField("be7_fwhm") + @TableField(value = "be7_fwhm", updateStrategy = FieldStrategy.IGNORED) private Double be7FWHM; - @TableField("xe133_mdc") + @TableField(value = "xe133_mdc", updateStrategy = FieldStrategy.IGNORED) private String xe133MDC; - @TableField("xe_vol") + @TableField(value = "xe_vol", updateStrategy = FieldStrategy.IGNORED) private Double xeVol; - @TableField("xe131m_flag") + @TableField(value = "xe131m_flag", updateStrategy = FieldStrategy.IGNORED) private Integer xe131mFlag; - @TableField("xe133m_flag") + @TableField(value = "xe133m_flag", updateStrategy = FieldStrategy.IGNORED) private Integer xe133mFlag; - @TableField("xe133_flag") + @TableField(value = "xe133_flag", updateStrategy = FieldStrategy.IGNORED) private Integer xe133Flag; - @TableField("xe135_flag") + @TableField(value = "xe135_flag", updateStrategy = FieldStrategy.IGNORED) private Integer xe135Flag; /** 备注 */ private String remark; 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 77cadf77..62264a5e 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 @@ -184,17 +184,23 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl colTimes = ListUtil - .toList(analysisRule.getColTime().split(comma)); - analysisRuleInfo.setColTime(colTimes); + if (null != analysisRule.getColTime()) { + List colTimes = ListUtil + .toList(analysisRule.getColTime().split(comma)); + analysisRuleInfo.setColTime(colTimes); + } - List acqTimes = ListUtil - .toList(analysisRule.getAcqTime().split(comma)); - analysisRuleInfo.setColTime(acqTimes); + if (null != analysisRule.getAcqTime()) { + List acqTimes = ListUtil + .toList(analysisRule.getAcqTime().split(comma)); + analysisRuleInfo.setColTime(acqTimes); + } - List xe133MDC = ListUtil - .toList(analysisRule.getXe133MDC().split(comma)); - analysisRuleInfo.setColTime(xe133MDC); + if (null != analysisRule.getXe133MDC()) { + List xe133MDC = ListUtil + .toList(analysisRule.getXe133MDC().split(comma)); + analysisRuleInfo.setColTime(xe133MDC); + } return Result.OK(analysisRuleInfo); }