diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceParam.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceParam.java index 0a60d5e..f3d6d83 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceParam.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceParam.java @@ -78,6 +78,30 @@ public class BaseDeviceParam extends BaseEntity { @Excel(name = "读取频率") private Long readFrequency; + /** + * 参数上限阈值 + */ + @Excel(name = "上限阈值") + private Double upperLimit; + + /** + * 参数下限阈值 + */ + @Excel(name = "下限阈值") + private Double lowerLimit; + + /** + * 预警级别(1一般/2重要/3紧急) + */ + @Excel(name = "预警级别", readConverterExp = "1=一般,2=重要,3=紧急") + private String alertLevel; + + /** + * 是否启用预警(0否/1是) + */ + @Excel(name = "启用预警", readConverterExp = "0=否,1=是") + private String alertEnabled; + /** * 启用标识 */ @@ -230,6 +254,38 @@ public class BaseDeviceParam extends BaseEntity { return updatedTime; } + public Double getUpperLimit() { + return upperLimit; + } + + public void setUpperLimit(Double upperLimit) { + this.upperLimit = upperLimit; + } + + public Double getLowerLimit() { + return lowerLimit; + } + + public void setLowerLimit(Double lowerLimit) { + this.lowerLimit = lowerLimit; + } + + public String getAlertLevel() { + return alertLevel; + } + + public void setAlertLevel(String alertLevel) { + this.alertLevel = alertLevel; + } + + public String getAlertEnabled() { + return alertEnabled; + } + + public void setAlertEnabled(String alertEnabled) { + this.alertEnabled = alertEnabled; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml index 9b49106..5f02fe5 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml @@ -20,6 +20,10 @@ + + + + @@ -31,6 +35,10 @@ dp.param_type, dp.device_code, dp.read_frequency, + dp.upper_limit, + dp.lower_limit, + dp.alert_level, + dp.alert_enabled, dp.is_flag, dp.created_by, dp.created_time, @@ -96,6 +104,10 @@ param_type, device_code, read_frequency, + upper_limit, + lower_limit, + alert_level, + alert_enabled, is_flag, created_by, created_time, @@ -111,6 +123,10 @@ #{paramType}, #{deviceCode}, #{readFrequency}, + #{upperLimit}, + #{lowerLimit}, + #{alertLevel}, + #{alertEnabled}, #{isFlag}, #{createdBy}, #{createdTime}, @@ -129,6 +145,10 @@ param_type = #{paramType}, device_code = #{deviceCode}, read_frequency = #{readFrequency}, + upper_limit = #{upperLimit}, + lower_limit = #{lowerLimit}, + alert_level = #{alertLevel}, + alert_enabled = #{alertEnabled}, is_flag = #{isFlag}, created_by = #{createdBy}, created_time = #{createdTime},