调整代码规范

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

@@ -1,206 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain;
-
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-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;
-
-/**
- * 告警配置对象 IotWarnConfig
- * 
- * @author 杨晓辉
- * @date 2025-03-07
- */
-public class IotWarnConfig extends IotBaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 自增主键 */
-    private Long id;
-
-    /** 告警配置业务标识 */
-    @Length(max = 36 , message = "告警配置业务标识最大长度为36")
-    private String wcBid;
-
-    /** 告警名称 */
-    @Length(max = 36 , message = "告警名称最大长度为36")
-    private String wcName;
-
-    /** 告警描述 */
-    @Length(max = 100 , message = "告警描述最大长度为100")
-    private String wcDesc;
-
-    /** 启用状态:0启用,1关闭》 */
-    @Length(max = 1 , message = "启用状态:0启用,1关闭》最大长度为1")
-    private String wcStatus;
-
-    /** 告警等级：0普通,1重要,2紧急》 */
-    @Length(max = 1 , message = "告警等级：0普通,1重要,2紧急》最大长度为1")
-    private String wcLevel;
-
-    /** 触发类型: 0指标告警,1离线告警 */
-    @Length(max = 1 , message = "触发类型: 0指标告警,1离线告警最大长度为1")
-    private String wcTouchtype;
-
-    /** 触发条件：0任一指标,1多指标同时满足 */
-    @Length(max = 1 , message = "触发条件：0任一指标,1多指标同时满足最大长度为1")
-    private String wcCondition;
-
-    /** 创建人 */
-    @Length(max = 36 , message = "创建人最大长度为36")
-    private String wcCreator;
-
-    /** 创建时间 */
-    @Length(max = 19 , message = "创建时间最大长度为19")
-    private String wcCreateddate;
-
-    /** 更新时间 */
-    @Length(max = 19 , message = "更新时间最大长度为19")
-    private String wcModifieddate;
-
-    /** 更新人 */
-    @Length(max = 36 , message = "更新人最大长度为36")
-    private String wcModifier;
-
-    /** 租户标识 */
-    @Length(max = 36 , message = "租户标识最大长度为36")
-    private String tid;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setWcBid(String wcBid)
-    {
-        this.wcBid = wcBid;
-    }
-
-    public String getWcBid()
-    {
-        return wcBid;
-    }
-    public void setWcName(String wcName)
-    {
-        this.wcName = wcName;
-    }
-
-    public String getWcName()
-    {
-        return wcName;
-    }
-    public void setWcDesc(String wcDesc)
-    {
-        this.wcDesc = wcDesc;
-    }
-
-    public String getWcDesc()
-    {
-        return wcDesc;
-    }
-    public void setWcStatus(String wcStatus)
-    {
-        this.wcStatus = wcStatus;
-    }
-
-    public String getWcStatus()
-    {
-        return wcStatus;
-    }
-    public void setWcLevel(String wcLevel)
-    {
-        this.wcLevel = wcLevel;
-    }
-
-    public String getWcLevel()
-    {
-        return wcLevel;
-    }
-    public void setWcTouchtype(String wcTouchtype)
-    {
-        this.wcTouchtype = wcTouchtype;
-    }
-
-    public String getWcTouchtype()
-    {
-        return wcTouchtype;
-    }
-    public void setWcCondition(String wcCondition)
-    {
-        this.wcCondition = wcCondition;
-    }
-
-    public String getWcCondition()
-    {
-        return wcCondition;
-    }
-    public void setWcCreator(String wcCreator)
-    {
-        this.wcCreator = wcCreator;
-    }
-
-    public String getWcCreator()
-    {
-        return wcCreator;
-    }
-    public void setWcCreateddate(String wcCreateddate)
-    {
-        this.wcCreateddate = wcCreateddate;
-    }
-
-    public String getWcCreateddate()
-    {
-        return wcCreateddate;
-    }
-    public void setWcModifieddate(String wcModifieddate)
-    {
-        this.wcModifieddate = wcModifieddate;
-    }
-
-    public String getWcModifieddate()
-    {
-        return wcModifieddate;
-    }
-    public void setWcModifier(String wcModifier)
-    {
-        this.wcModifier = wcModifier;
-    }
-
-    public String getWcModifier()
-    {
-        return wcModifier;
-    }
-    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("wcBid", getWcBid())
-            .append("wcName", getWcName())
-            .append("wcDesc", getWcDesc())
-            .append("wcStatus", getWcStatus())
-            .append("wcLevel", getWcLevel())
-            .append("wcTouchtype", getWcTouchtype())
-            .append("wcCondition", getWcCondition())
-            .append("wcCreator", getWcCreator())
-            .append("wcCreateddate", getWcCreateddate())
-            .append("wcModifieddate", getWcModifieddate())
-            .append("wcModifier", getWcModifier())
-            .append("tid", getTid())
-            .toString();
-    }
-}

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

@@ -1,124 +0,0 @@
-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

@@ -1,18 +1,18 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import org.hibernate.validator.constraints.Length;
+import lombok.Data;
 import com.yunfeiyun.agmp.common.annotation.Excel;
 
 /**
- * 告警指标，存储所有与告警相关的指标信息对象 IotWarnIndicator
+ * 告警指标，存储所有与告警相关的指标信息对象 IotWarnindicator
  * 
  * @author 杨晓辉
  * @date 2025-03-07
  */
-public class IotWarnIndicator extends IotBaseEntity
-{
+@Data
+public class IotWarnindicator extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 自增主键 */
@@ -31,11 +31,11 @@ public class IotWarnIndicator extends IotBaseEntity
     private String wdBid;
 
     /** 指标表达式，例如：大于/大于等于/小于/小于等于/范围/等于/不在范围 */
-    @Length(max = 50 , message = "指标表达式，例如：大于/大于等于/小于/小于等于/范围/等于/不在范围最大长度为50")
+    @Length(max = 50 , message = "指标表达式最大长度为50")
     private String wiExpression;
 
     /** 指标值，例如：10/10-100 */
-    @Length(max = 100 , message = "指标值，例如：10/10-100最大长度为100")
+    @Length(max = 100 , message = "指标值最大长度为100")
     private String wiValue;
 
     /** 创建人 */
@@ -58,120 +58,4 @@ public class IotWarnIndicator extends IotBaseEntity
     @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

@@ -1,107 +0,0 @@
-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/IotWarnReceiver.java

@@ -1,93 +0,0 @@
-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

@@ -1,247 +0,0 @@
-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

@@ -0,0 +1,70 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警配置对象 IotWarnconfig
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarnconfig extends IotBaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警配置业务标识 */
+    @Length(max = 36 , message = "告警配置业务标识最大长度为36")
+    private String wcBid;
+
+    /** 告警名称 */
+    @Length(max = 36 , message = "告警名称最大长度为36")
+    private String wcName;
+
+    /** 告警描述 */
+    @Length(max = 100 , message = "告警描述最大长度为100")
+    private String wcDesc;
+
+    /** 启用状态:0启用,1关闭》 */
+    @Length(max = 1 , message = "启用状态最大长度为1")
+    private String wcStatus;
+
+    /** 告警等级：0普通,1重要,2紧急》 */
+    @Length(max = 1 , message = "告警等级最大长度为1")
+    private String wcLevel;
+
+    /** 触发类型: 0指标告警,1离线告警 */
+    @Length(max = 1 , message = "触发类型最大长度为1")
+    private String wcTouchtype;
+
+    /** 触发条件：0任一指标,1多指标同时满足 */
+    @Length(max = 1 , message = "触发条件最大长度为1")
+    private String wcCondition;
+
+    /** 创建人 */
+    @Length(max = 36 , message = "创建人最大长度为36")
+    private String wcCreator;
+
+    /** 创建时间 */
+    @Length(max = 19 , message = "创建时间最大长度为19")
+    private String wcCreateddate;
+
+    /** 更新时间 */
+    @Length(max = 19 , message = "更新时间最大长度为19")
+    private String wcModifieddate;
+
+    /** 更新人 */
+    @Length(max = 36 , message = "更新人最大长度为36")
+    private String wcModifier;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+}

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

@@ -0,0 +1,48 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警触发次数对象 IotWarncount
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarncount extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 告警触发次数标识 */
+    @Length(max = 36 , message = "告警触发次数标识最大长度为36")
+    private String wctBid;
+
+    /** 告警配置业务标识 */
+    @Length(max = 36 , message = "告警配置业务标识最大长度为36")
+    private String wcBid;
+
+    /** 设备ID */
+    @Length(max = 36 , message = "设备ID最大长度为36")
+    private String devBid;
+
+    /** 当前重复次数 */
+    @Excel(name = "当前重复次数")
+    private Long wctCount;
+
+    /** 最后更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+}

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

@@ -1,8 +1,8 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import org.hibernate.validator.constraints.Length;
+import lombok.Data;
 import com.yunfeiyun.agmp.common.annotation.Excel;
 
 /**
@@ -11,8 +11,8 @@ import com.yunfeiyun.agmp.common.annotation.Excel;
  * @author 杨晓辉
  * @date 2025-03-07
  */
-public class IotWarndataitem extends IotBaseEntity
-{
+@Data
+public class IotWarndataitem extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 自增编号 */
@@ -23,7 +23,7 @@ public class IotWarndataitem extends IotBaseEntity
     private String wdBid;
 
     /** 要素对象类型：0设备要素,1型号要素 */
-    @Length(max = 1 , message = "要素对象类型：0设备要素,1型号要素最大长度为1")
+    @Length(max = 1 , message = "要素对象类型最大长度为1")
     private String wdType;
 
     /** 设备/型号 的业务标识 */
@@ -35,7 +35,7 @@ public class IotWarndataitem extends IotBaseEntity
     private String wdName;
 
     /** 要素编码(字段) */
-    @Length(max = 30 , message = "要素编码(字段)最大长度为30")
+    @Length(max = 30 , message = "要素编码最大长度为30")
     private String wdCode;
 
     /** 要素单位 */
@@ -43,93 +43,7 @@ public class IotWarndataitem extends IotBaseEntity
     private String wdUnit;
 
     /** 要素类型: 0默认,1特殊 */
-    @Length(max = 1 , message = "要素类型: 0默认,1特殊最大长度为1")
+    @Length(max = 1 , message = "要素类型最大长度为1")
     private String wdOptiontype;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setWdBid(String wdBid)
-    {
-        this.wdBid = wdBid;
-    }
-
-    public String getWdBid()
-    {
-        return wdBid;
-    }
-    public void setWdType(String wdType)
-    {
-        this.wdType = wdType;
-    }
-
-    public String getWdType()
-    {
-        return wdType;
-    }
-    public void setWdObjid(String wdObjid)
-    {
-        this.wdObjid = wdObjid;
-    }
-
-    public String getWdObjid()
-    {
-        return wdObjid;
-    }
-    public void setWdName(String wdName)
-    {
-        this.wdName = wdName;
-    }
-
-    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 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/IotWarnobject.java

@@ -0,0 +1,41 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警对象对象 IotWarnobject
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarnobject extends BaseEntity {
+    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 = "告警对象类型最大长度为50")
+    private String woType;
+
+    /** 设备id/型号id */
+    @Length(max = 36 , message = "设备id/型号id最大长度为36")
+    private String woObjid;
+
+    /** 租户标识 */
+    @Length(max = 36 , message = "租户标识最大长度为36")
+    private String tid;
+
+}

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

@@ -0,0 +1,65 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警通知策略，存储所有与告警相关的通知策略信息对象 IotWarnpolicy
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarnpolicy extends BaseEntity {
+    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 = "推送方式最大长度为1")
+    private String wpType;
+
+    /** 推送时间段，wpType为1时生效 */
+    @Length(max = 50 , message = "推送时间段最大长度为50")
+    private String deliveryTimePeriod;
+
+    /** 通知推送渠道，例如：APP/短信/微信/钉钉/站内等 */
+    @Length(max = 1 , message = "通知推送渠道最大长度为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;
+
+}

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

@@ -0,0 +1,37 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警接收者对象 IotWarnreceiver
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarnreceiver extends BaseEntity {
+    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;
+
+}

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

@@ -0,0 +1,80 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+import org.hibernate.validator.constraints.Length;
+import lombok.Data;
+import com.yunfeiyun.agmp.common.annotation.Excel;
+
+/**
+ * 告警记录对象 IotWarnrecord
+ * 
+ * @author 杨晓辉
+ * @date 2025-03-07
+ */
+@Data
+public class IotWarnrecord extends BaseEntity{
+    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;
+
+}