新增预警相关实体

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnCount.java

@@ -0,0 +1,124 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警触发次数对象 IotWarnCount
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnCount extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警触发次数标识 */
+    @Length(max = 36 , message = "告警触发次数标识最大长度为36")
+    private String wrBid;
+
+    /** 告警配置业务标识 */
+    @Length(max = 36 , message = "告警配置业务标识最大长度为36")
+    private String wcBid;
+
+    /** 设备ID */
+    @Length(max = 36 , message = "设备ID最大长度为36")
+    private String devBid;
+
+    /** 当前重复次数 */
+    @Excel(name = "当前重复次数")
+    private Long wrCount;
+
+    /** 最后更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWrBid(String wrBid)
+    {
+        this.wrBid = wrBid;
+    }
+
+    public String getWrBid()
+    {
+        return wrBid;
+    }
+    public void setWcBid(String wcBid)
+    {
+        this.wcBid = wcBid;
+    }
+
+    public String getWcBid()
+    {
+        return wcBid;
+    }
+    public void setDevBid(String devBid)
+    {
+        this.devBid = devBid;
+    }
+
+    public String getDevBid()
+    {
+        return devBid;
+    }
+    public void setWrCount(Long wrCount)
+    {
+        this.wrCount = wrCount;
+    }
+
+    public Long getWrCount()
+    {
+        return wrCount;
+    }
+    public void setLastUpdateTime(Date lastUpdateTime)
+    {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    public Date getLastUpdateTime()
+    {
+        return lastUpdateTime;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wrBid", getWrBid())
+            .append("wcBid", getWcBid())
+            .append("devBid", getDevBid())
+            .append("wrCount", getWrCount())
+            .append("lastUpdateTime", getLastUpdateTime())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnIndicator.java

@@ -0,0 +1,177 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警指标，存储所有与告警相关的指标信息对象 IotWarnIndicator
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnIndicator extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警指标业务标识 */
+    @Length(max = 36 , message = "告警指标业务标识最大长度为36")
+    private String wiBid;
+
+    /** 告警标识 */
+    @Length(max = 36 , message = "告警标识最大长度为36")
+    private String wcBid;
+
+    /** 告警要素 */
+    @Length(max = 36 , message = "告警要素最大长度为36")
+    private String wdBid;
+
+    /** 指标表达式，例如：大于/大于等于/小于/小于等于/范围/等于/不在范围 */
+    @Length(max = 50 , message = "指标表达式，例如：大于/大于等于/小于/小于等于/范围/等于/不在范围最大长度为50")
+    private String wiExpression;
+
+    /** 指标值，例如：10/10-100 */
+    @Length(max = 100 , message = "指标值，例如：10/10-100最大长度为100")
+    private String wiValue;
+
+    /** 创建人 */
+    @Length(max = 36 , message = "创建人最大长度为36")
+    private String wiCreator;
+
+    /** 创建时间 */
+    @Length(max = 19 , message = "创建时间最大长度为19")
+    private String wiCreateddate;
+
+    /** 更新时间 */
+    @Length(max = 19 , message = "更新时间最大长度为19")
+    private String wiModifieddate;
+
+    /** 更新人 */
+    @Length(max = 36 , message = "更新人最大长度为36")
+    private String wiModifier;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWiBid(String wiBid)
+    {
+        this.wiBid = wiBid;
+    }
+
+    public String getWiBid()
+    {
+        return wiBid;
+    }
+    public void setWcBid(String wcBid)
+    {
+        this.wcBid = wcBid;
+    }
+
+    public String getWcBid()
+    {
+        return wcBid;
+    }
+    public void setWdBid(String wdBid)
+    {
+        this.wdBid = wdBid;
+    }
+
+    public String getWdBid()
+    {
+        return wdBid;
+    }
+    public void setWiExpression(String wiExpression)
+    {
+        this.wiExpression = wiExpression;
+    }
+
+    public String getWiExpression()
+    {
+        return wiExpression;
+    }
+    public void setWiValue(String wiValue)
+    {
+        this.wiValue = wiValue;
+    }
+
+    public String getWiValue()
+    {
+        return wiValue;
+    }
+    public void setWiCreator(String wiCreator)
+    {
+        this.wiCreator = wiCreator;
+    }
+
+    public String getWiCreator()
+    {
+        return wiCreator;
+    }
+    public void setWiCreateddate(String wiCreateddate)
+    {
+        this.wiCreateddate = wiCreateddate;
+    }
+
+    public String getWiCreateddate()
+    {
+        return wiCreateddate;
+    }
+    public void setWiModifieddate(String wiModifieddate)
+    {
+        this.wiModifieddate = wiModifieddate;
+    }
+
+    public String getWiModifieddate()
+    {
+        return wiModifieddate;
+    }
+    public void setWiModifier(String wiModifier)
+    {
+        this.wiModifier = wiModifier;
+    }
+
+    public String getWiModifier()
+    {
+        return wiModifier;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wiBid", getWiBid())
+            .append("wcBid", getWcBid())
+            .append("wdBid", getWdBid())
+            .append("wiExpression", getWiExpression())
+            .append("wiValue", getWiValue())
+            .append("wiCreator", getWiCreator())
+            .append("wiCreateddate", getWiCreateddate())
+            .append("wiModifieddate", getWiModifieddate())
+            .append("wiModifier", getWiModifier())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnObject.java

@@ -0,0 +1,107 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警对象对象 IotWarnObject
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnObject extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警对象业务标识 */
+    @Length(max = 36 , message = "告警对象业务标识最大长度为36")
+    private String woBid;
+
+    /** 告警标识 */
+    @Length(max = 36 , message = "告警标识最大长度为36")
+    private String wcBid;
+
+    /** 告警对象类型：0针对型号,1设备id */
+    @Length(max = 50 , message = "告警对象类型：0针对型号,1设备id最大长度为50")
+    private String woType;
+
+    /** 设备id/型号id */
+    @Length(max = 36 , message = "设备id/型号id最大长度为36")
+    private String woObjid;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWoBid(String woBid)
+    {
+        this.woBid = woBid;
+    }
+
+    public String getWoBid()
+    {
+        return woBid;
+    }
+    public void setWcBid(String wcBid)
+    {
+        this.wcBid = wcBid;
+    }
+
+    public String getWcBid()
+    {
+        return wcBid;
+    }
+    public void setWoType(String woType)
+    {
+        this.woType = woType;
+    }
+
+    public String getWoType()
+    {
+        return woType;
+    }
+    public void setWoObjid(String woObjid)
+    {
+        this.woObjid = woObjid;
+    }
+
+    public String getWoObjid()
+    {
+        return woObjid;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("woBid", getWoBid())
+            .append("wcBid", getWcBid())
+            .append("woType", getWoType())
+            .append("woObjid", getWoObjid())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnPolicy.java

@@ -0,0 +1,191 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警通知策略，存储所有与告警相关的通知策略信息对象 IotWarnPolicy
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnPolicy extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警通知策略业务标识 */
+    @Length(max = 36 , message = "告警通知策略业务标识最大长度为36")
+    private String wpBid;
+
+    /** 告警标识 */
+    @Length(max = 36 , message = "告警标识最大长度为36")
+    private String wcBid;
+
+    /** 通知频率，例如：实时/每小时/每天等 */
+    @Length(max = 50 , message = "通知频率，例如：实时/每小时/每天等最大长度为50")
+    private String wpFrequency;
+
+    /** 推送方式: 0即时推送,1选定时间内推送 */
+    @Length(max = 1 , message = "推送方式: 0即时推送,1选定时间内推送最大长度为1")
+    private String wpType;
+
+    /** 推送时间段，wpType为1时生效 */
+    @Length(max = 50 , message = "推送时间段，wpType为1时生效最大长度为50")
+    private String deliveryTimePeriod;
+
+    /** 通知推送渠道，例如：APP/短信/微信/钉钉/站内等 */
+    @Length(max = 1 , message = "通知推送渠道，例如：APP/短信/微信/钉钉/站内等最大长度为1")
+    private String wpChannel;
+
+    /** 创建人 */
+    @Length(max = 36 , message = "创建人最大长度为36")
+    private String wpCreator;
+
+    /** 创建时间 */
+    @Length(max = 19 , message = "创建时间最大长度为19")
+    private String wpCreateddate;
+
+    /** 更新时间 */
+    @Length(max = 19 , message = "更新时间最大长度为19")
+    private String wpModifieddate;
+
+    /** 更新人 */
+    @Length(max = 36 , message = "更新人最大长度为36")
+    private String wpModifier;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWpBid(String wpBid)
+    {
+        this.wpBid = wpBid;
+    }
+
+    public String getWpBid()
+    {
+        return wpBid;
+    }
+    public void setWcBid(String wcBid)
+    {
+        this.wcBid = wcBid;
+    }
+
+    public String getWcBid()
+    {
+        return wcBid;
+    }
+    public void setWpFrequency(String wpFrequency)
+    {
+        this.wpFrequency = wpFrequency;
+    }
+
+    public String getWpFrequency()
+    {
+        return wpFrequency;
+    }
+    public void setWpType(String wpType)
+    {
+        this.wpType = wpType;
+    }
+
+    public String getWpType()
+    {
+        return wpType;
+    }
+    public void setDeliveryTimePeriod(String deliveryTimePeriod)
+    {
+        this.deliveryTimePeriod = deliveryTimePeriod;
+    }
+
+    public String getDeliveryTimePeriod()
+    {
+        return deliveryTimePeriod;
+    }
+    public void setWpChannel(String wpChannel)
+    {
+        this.wpChannel = wpChannel;
+    }
+
+    public String getWpChannel()
+    {
+        return wpChannel;
+    }
+    public void setWpCreator(String wpCreator)
+    {
+        this.wpCreator = wpCreator;
+    }
+
+    public String getWpCreator()
+    {
+        return wpCreator;
+    }
+    public void setWpCreateddate(String wpCreateddate)
+    {
+        this.wpCreateddate = wpCreateddate;
+    }
+
+    public String getWpCreateddate()
+    {
+        return wpCreateddate;
+    }
+    public void setWpModifieddate(String wpModifieddate)
+    {
+        this.wpModifieddate = wpModifieddate;
+    }
+
+    public String getWpModifieddate()
+    {
+        return wpModifieddate;
+    }
+    public void setWpModifier(String wpModifier)
+    {
+        this.wpModifier = wpModifier;
+    }
+
+    public String getWpModifier()
+    {
+        return wpModifier;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wpBid", getWpBid())
+            .append("wcBid", getWcBid())
+            .append("wpFrequency", getWpFrequency())
+            .append("wpType", getWpType())
+            .append("deliveryTimePeriod", getDeliveryTimePeriod())
+            .append("wpChannel", getWpChannel())
+            .append("wpCreator", getWpCreator())
+            .append("wpCreateddate", getWpCreateddate())
+            .append("wpModifieddate", getWpModifieddate())
+            .append("wpModifier", getWpModifier())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnReceiver.java

@@ -0,0 +1,93 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警接收者对象 IotWarnReceiver
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnReceiver extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警接收者业务标识 */
+    @Length(max = 36 , message = "告警接收者业务标识最大长度为36")
+    private String wrBid;
+
+    /** 告警标识 */
+    @Length(max = 36 , message = "告警标识最大长度为36")
+    private String wcBid;
+
+    /** 接收者id */
+    @Length(max = 100 , message = "接收者id最大长度为100")
+    private String wruserId;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWrBid(String wrBid)
+    {
+        this.wrBid = wrBid;
+    }
+
+    public String getWrBid()
+    {
+        return wrBid;
+    }
+    public void setWcBid(String wcBid)
+    {
+        this.wcBid = wcBid;
+    }
+
+    public String getWcBid()
+    {
+        return wcBid;
+    }
+    public void setWruserId(String wruserId)
+    {
+        this.wruserId = wruserId;
+    }
+
+    public String getWruserId()
+    {
+        return wruserId;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wrBid", getWrBid())
+            .append("wcBid", getWcBid())
+            .append("wruserId", getWruserId())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnRecord.java

@@ -0,0 +1,247 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警记录对象 IotWarnRecord
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+public class IotWarnRecord extends IotBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警记录标识 */
+    @Length(max = 36 , message = "告警记录标识最大长度为36")
+    private String wrBid;
+
+    /** 告警名称 */
+    @Length(max = 100 , message = "告警名称最大长度为100")
+    private String wrName;
+
+    /** 告警类型 */
+    @Length(max = 50 , message = "告警类型最大长度为50")
+    private String wrType;
+
+    /** 告警内容 */
+    @Length(max = 50 , message = "告警内容最大长度为50")
+    private String wrContent;
+
+    /** 告警等级《普通/重要/紧急》 */
+    @Length(max = 1 , message = "告警等级《普通/重要/紧急》最大长度为1")
+    private String wrLevel;
+
+    /** 设备型号 */
+    @Length(max = 50 , message = "设备型号最大长度为50")
+    private String devtypeBid;
+
+    /** 设备ID */
+    @Length(max = 36 , message = "设备ID最大长度为36")
+    private String devBid;
+
+    /** 处理状态，表示当前告警的状态（如未处理、已处理等） */
+    @Excel(name = "处理状态，表示当前告警的状态", readConverterExp = "如=未处理、已处理等")
+    private String status;
+
+    /** 处理人 */
+    @Length(max = 36 , message = "处理人最大长度为36")
+    private String wrDealuserid;
+
+    /** 处理结果 */
+    @Length(max = 36 , message = "处理结果最大长度为36")
+    private String wrDealresult;
+
+    /** 处理时间 */
+    @Length(max = 19 , message = "处理时间最大长度为19")
+    private String wrDealtime;
+
+    /** 创建人 */
+    @Length(max = 36 , message = "创建人最大长度为36")
+    private String wrCreator;
+
+    /** 创建时间 */
+    @Length(max = 19 , message = "创建时间最大长度为19")
+    private String wrCreateddate;
+
+    /** 上报数据冗余存储 */
+    @Length(max = 65535 , message = "上报数据冗余存储最大长度为65535")
+    private String wrData;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWrBid(String wrBid)
+    {
+        this.wrBid = wrBid;
+    }
+
+    public String getWrBid()
+    {
+        return wrBid;
+    }
+    public void setWrName(String wrName)
+    {
+        this.wrName = wrName;
+    }
+
+    public String getWrName()
+    {
+        return wrName;
+    }
+    public void setWrType(String wrType)
+    {
+        this.wrType = wrType;
+    }
+
+    public String getWrType()
+    {
+        return wrType;
+    }
+    public void setWrContent(String wrContent)
+    {
+        this.wrContent = wrContent;
+    }
+
+    public String getWrContent()
+    {
+        return wrContent;
+    }
+    public void setWrLevel(String wrLevel)
+    {
+        this.wrLevel = wrLevel;
+    }
+
+    public String getWrLevel()
+    {
+        return wrLevel;
+    }
+    public void setDevtypeBid(String devtypeBid)
+    {
+        this.devtypeBid = devtypeBid;
+    }
+
+    public String getDevtypeBid()
+    {
+        return devtypeBid;
+    }
+    public void setDevBid(String devBid)
+    {
+        this.devBid = devBid;
+    }
+
+    public String getDevBid()
+    {
+        return devBid;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setWrDealuserid(String wrDealuserid)
+    {
+        this.wrDealuserid = wrDealuserid;
+    }
+
+    public String getWrDealuserid()
+    {
+        return wrDealuserid;
+    }
+    public void setWrDealresult(String wrDealresult)
+    {
+        this.wrDealresult = wrDealresult;
+    }
+
+    public String getWrDealresult()
+    {
+        return wrDealresult;
+    }
+    public void setWrDealtime(String wrDealtime)
+    {
+        this.wrDealtime = wrDealtime;
+    }
+
+    public String getWrDealtime()
+    {
+        return wrDealtime;
+    }
+    public void setWrCreator(String wrCreator)
+    {
+        this.wrCreator = wrCreator;
+    }
+
+    public String getWrCreator()
+    {
+        return wrCreator;
+    }
+    public void setWrCreateddate(String wrCreateddate)
+    {
+        this.wrCreateddate = wrCreateddate;
+    }
+
+    public String getWrCreateddate()
+    {
+        return wrCreateddate;
+    }
+    public void setWrData(String wrData)
+    {
+        this.wrData = wrData;
+    }
+
+    public String getWrData()
+    {
+        return wrData;
+    }
+    public void setTid(String tid)
+    {
+        this.tid = tid;
+    }
+
+    public String getTid()
+    {
+        return tid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wrBid", getWrBid())
+            .append("wrName", getWrName())
+            .append("wrType", getWrType())
+            .append("wrContent", getWrContent())
+            .append("wrLevel", getWrLevel())
+            .append("devtypeBid", getDevtypeBid())
+            .append("devBid", getDevBid())
+            .append("status", getStatus())
+            .append("wrDealuserid", getWrDealuserid())
+            .append("wrDealresult", getWrDealresult())
+            .append("wrDealtime", getWrDealtime())
+            .append("wrCreator", getWrCreator())
+            .append("wrCreateddate", getWrCreateddate())
+            .append("wrData", getWrData())
+            .append("tid", getTid())
+            .toString();
+    }
+}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarnconfig.java

@@ -1,122 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain;
-
-import com.yunfeiyun.agmp.common.annotation.Excel;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 预警配置对象 IotWarnconfig
- * 
- * @author 杨晓辉
- * @date 2024-04-29
- */
-@Data
-public class IotWarnconfig extends IotBaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    private Long id;
-
-    /** 预警配置业务标识 */
-    @Excel(name = "预警配置业务标识")
-    private String wcBid;
-
-    /** 预警配置名称 */
-    @Excel(name = "预警配置名称")
-    private String wcName;
-
-    /** 预警配置预警类型 */
-    @Excel(name = "预警配置预警类型")
-    private String wcType;
-
-    /** 预警配置预警级别 */
-    @Excel(name = "预警配置预警级别")
-    private String wcLevel;
-
-    /** 预警配置通知方式 */
-    @Excel(name = "预警配置通知方式")
-    private String wcNoticetype;
-
-    /** 预警配置预警规则 */
-    @Excel(name = "预警配置预警规则")
-    private String wcRule;
-
-    /** 预警配置推送类型 */
-    @Excel(name = "预警配置推送类型")
-    private String wcPushtype;
-
-    /** 预警配置推送时间 */
-    @Excel(name = "预警配置推送时间")
-    private String wcPushtime;
-
-    /** 预警配置设备标识 */
-    @Excel(name = "预警配置设备标识")
-    private String devBid;
-
-    /** 预警配置消息接收角色标识 */
-    @Excel(name = "预警配置消息接收角色标识")
-    private String wcRevrole;
-
-    /** 预警配置消息接收用户标识 */
-    @Excel(name = "预警配置消息接收用户标识")
-    private String wcRecvuser;
-
-    /** 预警配置启用状态 */
-    @Excel(name = "预警配置启用状态")
-    private String wcAlvstatus;
-
-    /** 预警配置删除状态 */
-    @Excel(name = "预警配置删除状态")
-    private String wcDelstatus;
-
-    /** 预警配置时间范围 */
-    @Excel(name = "预警配置时间范围")
-    private String wcTimerange;
-
-    /** 预警配置创建人 */
-    @Excel(name = "预警配置创建人")
-    private String wcCreator;
-
-    /** 预警配置创建时间 */
-    @Excel(name = "预警配置创建时间")
-    private String wcCreateddate;
-
-    /** 预警配置修改人 */
-    @Excel(name = "预警配置修改人")
-    private String wcModifier;
-
-    /** 预警配置修改时间 */
-    @Excel(name = "预警配置修改时间")
-    private String wcModifieddate;
-
-    /** 预警配置防范建议 */
-    @Excel(name = "预警配置防范建议")
-    private String wcSuggestion;
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("wcBid", getWcBid())
-            .append("wcName", getWcName())
-            .append("wcType", getWcType())
-            .append("wcLevel", getWcLevel())
-            .append("wcNoticetype", getWcNoticetype())
-            .append("wcRule", getWcRule())
-            .append("wcPushtype", getWcPushtype())
-            .append("wcPushtime", getWcPushtime())
-            .append("devBid", getDevBid())
-            .append("wcRevrole", getWcRevrole())
-            .append("wcRecvuser", getWcRecvuser())
-            .append("wcAlvstatus", getWcAlvstatus())
-            .append("wcDelstatus", getWcDelstatus())
-            .append("wcCreator", getWcCreator())
-            .append("wcCreateddate", getWcCreateddate())
-            .append("wcModifier", getWcModifier())
-            .append("wcModifieddate", getWcModifieddate())
-            .toString();
-    }
-}

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotWarndataitem.java

@@ -1,85 +1,135 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.iot.common.enums.EnumCommonDataFactor;
-import lombok.Data;
 
 /**
- * 预警规则 数据项
+ * 告警要素对象 IotWarndataitem
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
  */
-@Data
-public class IotWarndataitem extends IotBaseEntity{
+public class IotWarndataitem extends IotBaseEntity
+{
     private static final long serialVersionUID = 1L;
 
     /** 自增编号 */
     private Long id;
 
-    /** 客户标识 */
-    @Excel(name = "客户标识")
-    private String cId;
-
-    /** 业务标识 */
-    @Excel(name = "业务标识")
+    /** 告警要素业务标识 */
+    @Length(max = 36 , message = "告警要素业务标识最大长度为36")
     private String wdBid;
 
-    /** 删除状态 */
-    @Excel(name = "删除状态")
-    private String wdDelstatus;
+    /** 要素对象类型：0设备要素,1型号要素 */
+    @Length(max = 1 , message = "要素对象类型：0设备要素,1型号要素最大长度为1")
+    private String wdType;
 
-    /** 数据项名称 */
-    @Excel(name = "数据项名称")
-    private String wdName;
+    /** 设备/型号 的业务标识 */
+    @Length(max = 36 , message = "设备/型号 的业务标识最大长度为36")
+    private String wdObjid;
 
-    /** 数据项类型 */
-    @Excel(name = "数据项类型")
-    private String wdType;
+    /** 要素名称 */
+    @Length(max = 20 , message = "要素名称最大长度为20")
+    private String wdName;
 
-    /** 数据项编码 */
-    @Excel(name = "数据项编码")
+    /** 要素编码(字段) */
+    @Length(max = 30 , message = "要素编码(字段)最大长度为30")
     private String wdCode;
 
-    /** 数据项单位 */
-    @Excel(name = "数据项单位")
+    /** 要素单位 */
+    @Length(max = 10 , message = "要素单位最大长度为10")
     private String wdUnit;
 
-    /** 数据项可选参数类型，多个以逗号分隔 */
-    @Excel(name = "数据项可选参数类型")
+    /** 要素类型: 0默认,1特殊 */
+    @Length(max = 1 , message = "要素类型: 0默认,1特殊最大长度为1")
     private String wdOptiontype;
 
-    /** 数据项 支持的运算符 */
-    @Excel(name = "支持的运算符")
-    private String wdOp;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String wdCreator;
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
 
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String wdCreateddate;
+    public Long getId()
+    {
+        return id;
+    }
+    public void setWdBid(String wdBid)
+    {
+        this.wdBid = wdBid;
+    }
 
-    /** 修改人 */
-    @Excel(name = "修改人")
-    private String wdModifier;
+    public String getWdBid()
+    {
+        return wdBid;
+    }
+    public void setWdType(String wdType)
+    {
+        this.wdType = wdType;
+    }
 
-    /** 修改时间 */
-    @Excel(name = "修改时间")
-    private String wdModifieddate;
+    public String getWdType()
+    {
+        return wdType;
+    }
+    public void setWdObjid(String wdObjid)
+    {
+        this.wdObjid = wdObjid;
+    }
 
-    private String code;
-    private String name;
-    private String unit;
-    private String ext;     //扩展信息，对于管式墒情，存放 采集位置（深度）
+    public String getWdObjid()
+    {
+        return wdObjid;
+    }
+    public void setWdName(String wdName)
+    {
+        this.wdName = wdName;
+    }
 
-    public IotWarndataitem(){
+    public String getWdName()
+    {
+        return wdName;
+    }
+    public void setWdCode(String wdCode)
+    {
+        this.wdCode = wdCode;
+    }
 
+    public String getWdCode()
+    {
+        return wdCode;
+    }
+    public void setWdUnit(String wdUnit)
+    {
+        this.wdUnit = wdUnit;
     }
 
-    public IotWarndataitem(EnumCommonDataFactor factor){
-        this.code = factor.getCode();
-        this.name = factor.getName();
-        this.unit = factor.getUnit();
+    public String getWdUnit()
+    {
+        return wdUnit;
+    }
+    public void setWdOptiontype(String wdOptiontype)
+    {
+        this.wdOptiontype = wdOptiontype;
     }
 
+    public String getWdOptiontype()
+    {
+        return wdOptiontype;
+    }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("wdBid", getWdBid())
+            .append("wdType", getWdType())
+            .append("wdObjid", getWdObjid())
+            .append("wdName", getWdName())
+            .append("wdCode", getWdCode())
+            .append("wdUnit", getWdUnit())
+            .append("wdOptiontype", getWdOptiontype())
+            .toString();
+    }
 }

src/main/java/com/yunfeiyun/agmp/iot/common/domain/reqvo/IotWarnconfigReqVo.java

@@ -1,12 +1,12 @@
 package com.yunfeiyun.agmp.iot.common.domain.reqvo;
 
-import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
+
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class IotWarnconfigReqVo extends IotWarnconfig {
+public class IotWarnconfigReqVo  {
     /**
      * 设备标识，多个用逗号分隔
      * （根据设备标识列表，过滤数据）

src/main/java/com/yunfeiyun/agmp/iot/common/domain/resvo/IotWarnconfigResVo.java

@@ -1,6 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain.resvo;
 
-import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
+
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 预警记录对象 IotWarnlog
  */
 @Data
-public class IotWarnconfigResVo extends IotWarnconfig
+public class IotWarnconfigResVo
 {
     private static final long serialVersionUID = 1L;