liuyaowen 10 місяців тому
батько
коміт
3d59b81681

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

@@ -12,7 +12,7 @@ import com.yunfeiyun.agmp.common.annotation.Excel;
  * @date 2025-03-07
  */
 @Data
-public class IotWarnindicator extends BaseEntity {
+public class IotWarnindicator extends IotBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 自增主键 */

+ 0 - 81
src/main/java/com/yunfeiyun/agmp/iot/common/domain/resvo/IotWarnlogResVo.java

@@ -1,81 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain.resvo;
-
-import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
-import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 预警记录对象 IotWarnlog
- */
-@Data
-public class IotWarnlogResVo extends IotWarnlog
-{
-    private static final long serialVersionUID = 1L;
-
-
-    @Excel(name = "预警名称", sort = 1)
-    private String wcName;
-    @Excel(name = "预警类型",sort = 5,readConverterExp = "1=虫情预警,2=灾情预警,3=墒情预警" )
-    private String wcType;
-
-    @Excel(name = "预警类型",sort = 5)
-    private String wtName;
-
-    //@Excel(name = "设备标识")
-    //V3 改为iotwarnlog表的字段 private String devBid;
-
-    @Excel(name = "设备编号",sort = 2)
-    private String devCode;
-    //@Excel(name = "设备名称")
-    private String devName;
-
-    @Excel(name = "绑定地块",sort = 3)
-    private String blockName;
-
-    @Excel(name = "预警级别",sort = 8,readConverterExp = "0=普通预警,1=紧急预警" )
-    private String wcLevel;
-    //@Excel(name = "通知类型")
-    private String wcNoticetype;
-    @Excel(name = "预警接收方式",sort = 7)
-    private String wcNoticetypeName;
-    //@Excel(name = "时间范围")
-    private String wcTimerange;
-
-    private String wcRevrole;
-    private String wcRevroleName;
-    private String wcRecvuser;
-    @Excel(name = "接收用户",sort = 5)
-    private String wcRecvuserName;
-
-    @Excel(name = "防范建议",sort = 10)
-    private String wcSuggestion;
-
-    //推送类型
-    private String wcPushtype;
-
-    //系统消息msgid
-    private String msgId;
-
-    //系统消息-已读状态
-    private String msgReadstatus;
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("wlBid", getWlBid())
-            .append("wcBid", getWcBid())
-            .append("wlContent", getWlContent())
-            .append("wlTime", getWlTime())
-            .append("msgBatchid", getMsgBatchid())
-            .append("wlDelstatus", getWlDelstatus())
-            .append("wlCreator", getWlCreator())
-            .append("wlCreateddate", getWlCreateddate())
-            .append("wlModifier", getWlModifier())
-            .append("wlModifieddate", getWlModifieddate())
-            .toString();
-    }
-}