新增 设备解绑接口

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

@@ -1,11 +1,9 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import com.yunfeiyun.agmp.common.utils.DictUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -17,7 +15,8 @@ import java.math.BigDecimal;
  * @author 杨晓辉
  * @date 2023-05-15
  */
-public class FmsBlock extends BaseEntity
+@Data
+public class FmsBlock extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -87,6 +86,8 @@ public class FmsBlock extends BaseEntity
     /** 地块名称,用于查询时等于 */
     private String blockNameEq;
 
+    private String tid;
+
     public String getBlockTypeContent() {
         if (!StringUtils.isEmpty(this.blockType)) {
             return DictUtils.getDictLabel("fms_block_type", this.blockType);
@@ -95,158 +96,4 @@ public class FmsBlock extends BaseEntity
         }
     }
 
-    public void setBlockTypeContent(String blockTypeContent) {
-        this.blockTypeContent = blockTypeContent;
-    }
-
-    public String getResIds() {
-        return resIds;
-    }
-
-    public void setResIds(String resIds) {
-        this.resIds = resIds;
-    }
-
-    public String getBlockRemark() {
-        return blockRemark;
-    }
-
-    public void setBlockRemark(String blockRemark) {
-        this.blockRemark = blockRemark;
-    }
-
-    public String getBlockPreview() {
-        return blockPreview;
-    }
-
-    public void setBlockPreview(String blockPreview) {
-        this.blockPreview = blockPreview;
-    }
-
-    public void setBlockId(String blockId)
-    {
-        this.blockId = blockId;
-    }
-
-    public String getBlockId()
-    {
-        return blockId;
-    }
-    public void setLandId(String landId)
-    {
-        this.landId = landId;
-    }
-
-    public String getLandId()
-    {
-        return landId;
-    }
-    public void setBlockName(String blockName)
-    {
-        this.blockName = blockName;
-    }
-
-    public String getBlockName()
-    {
-        return blockName;
-    }
-    public void setBlockType(String blockType)
-    {
-        this.blockType = blockType;
-    }
-
-    public String getBlockType()
-    {
-        return blockType;
-    }
-    public void setBlockManager(String blockManager)
-    {
-        this.blockManager = blockManager;
-    }
-
-    public String getBlockManager()
-    {
-        return blockManager;
-    }
-    public void setBlockManagername(String blockManagername)
-    {
-        this.blockManagername = blockManagername;
-    }
-
-    public String getBlockManagername()
-    {
-        return blockManagername;
-    }
-    public void setBlockArea(BigDecimal blockArea)
-    {
-        this.blockArea = blockArea;
-    }
-
-    public BigDecimal getBlockArea()
-    {
-        return blockArea;
-    }
-    public void setBlockAreaplant(BigDecimal blockAreaplant)
-    {
-        this.blockAreaplant = blockAreaplant;
-    }
-
-    public BigDecimal getBlockAreaplant()
-    {
-        return blockAreaplant;
-    }
-    public void setBlockLngrange(String blockLngrange)
-    {
-        this.blockLngrange = blockLngrange;
-    }
-
-    public String getBlockLngrange()
-    {
-        return blockLngrange;
-    }
-    public void setBlockColor(String blockColor)
-    {
-        this.blockColor = blockColor;
-    }
-
-    public String getBlockColor()
-    {
-        return blockColor;
-    }
-
-    public String getBlockNameEq() {
-        return blockNameEq;
-    }
-
-    public void setBlockNameEq(String blockNameEq) {
-        this.blockNameEq = blockNameEq;
-    }
-
-    public Integer getBlockSeq() {
-        return blockSeq;
-    }
-
-    public void setBlockSeq(Integer blockSeq) {
-        this.blockSeq = blockSeq;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("blockId", getBlockId())
-            .append("landId", getLandId())
-            .append("blockName", getBlockName())
-            .append("blockType", getBlockType())
-            .append("blockManager", getBlockManager())
-            .append("blockManagername", getBlockManagername())
-            .append("blockArea", getBlockArea())
-            .append("blockAreaplant", getBlockAreaplant())
-            .append("blockLngrange", getBlockLngrange())
-            .append("blockColor", getBlockColor())
-            .append("blockPreview", getBlockPreview())
-            .append("blockRemark", getBlockRemark())
-            .append("resIds", getResIds())
-            .append("blockNameEq", getBlockNameEq())
-            .toString();
-    }
 }

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

@@ -1,207 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain;
-
-import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-import com.yunfeiyun.agmp.common.utils.DictUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-
-/**
- * 作物对象 FmsCrop
- * 
- * @author 杨晓辉
- * @date 2023-05-16
- */
-public class FmsCrop extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 作物标识 */
-    private String cropId;
-
-    /** 作物名称 */
-    @NotBlank(message = "作物名称不能为空")
-    @Excel(name = "作物名称")
-    private String cropName;
-
-    /** 作物种类 */
-    @Excel(name = "作物种类")
-    private String cropType;
-
-    /** 作物主要类型 */
-    @NotBlank(message = "作物类型不能为空")
-    @Excel(name = "作物主要类型")
-    private String cropMaintype;
-
-    /** 作物推荐状态 */
-    @Excel(name = "作物推荐状态")
-    private String cropRcmdstatus;
-
-    /** 作物预览图 */
-    @Excel(name = "作物预览图")
-    private String cropPreview;
-
-    /** 作物备注 */
-    @Excel(name = "作物备注")
-    private String cropRemark;
-
-    @Excel(name = "地块预览图标识")
-    private String resIds;
-
-    /** 作物主要类型 */
-    @Excel(name = "作物主要类型")
-    private String cropMaintypeContent;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String cropCreator;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String cropCreateddate;
-
-    @Excel(name = "作物预览图")
-    private String cropVideo;
-    @Excel(name = "地块预览图标识")
-    private String videoIds;
-
-    private BigDecimal cropInitialvalue;
-
-    public String getCropMaintypeContent() {
-        if (!StringUtils.isEmpty(this.cropMaintype)) {
-            return DictUtils.getDictLabel("fms_crop_type", this.cropMaintype);
-        } else {
-            return "";
-        }
-    }
-
-    public String getCropCreator() {
-        return cropCreator;
-    }
-
-    public void setCropCreator(String cropCreator) {
-        this.cropCreator = cropCreator;
-    }
-
-    public String getCropCreateddate() {
-        return cropCreateddate;
-    }
-
-    public void setCropCreateddate(String cropCreateddate) {
-        this.cropCreateddate = cropCreateddate;
-    }
-
-    public String getResIds() {
-        return resIds;
-    }
-
-    public void setResIds(String resIds) {
-        this.resIds = resIds;
-    }
-
-    public void setCropId(String cropId)
-    {
-        this.cropId = cropId;
-    }
-
-    public String getCropId()
-    {
-        return cropId;
-    }
-    public void setCropName(String cropName)
-    {
-        this.cropName = cropName;
-    }
-
-    public String getCropName()
-    {
-        return cropName;
-    }
-    public void setCropType(String cropType)
-    {
-        this.cropType = cropType;
-    }
-
-    public String getCropType()
-    {
-        return cropType;
-    }
-    public void setCropMaintype(String cropMaintype)
-    {
-        this.cropMaintype = cropMaintype;
-    }
-
-    public String getCropMaintype()
-    {
-        return cropMaintype;
-    }
-    public void setCropRcmdstatus(String cropRcmdstatus)
-    {
-        this.cropRcmdstatus = cropRcmdstatus;
-    }
-
-    public String getCropRcmdstatus()
-    {
-        return cropRcmdstatus;
-    }
-    public void setCropPreview(String cropPreview)
-    {
-        this.cropPreview = cropPreview;
-    }
-
-    public String getCropPreview()
-    {
-        return cropPreview;
-    }
-    public void setCropRemark(String cropRemark)
-    {
-        this.cropRemark = cropRemark;
-    }
-
-    public String getCropRemark()
-    {
-        return cropRemark;
-    }
-
-    public String getCropVideo() {
-        return cropVideo;
-    }
-
-    public void setCropVideo(String cropVideo) {
-        this.cropVideo = cropVideo;
-    }
-
-    public String getVideoIds() {
-        return videoIds;
-    }
-
-    public void setVideoIds(String videoIds) {
-        this.videoIds = videoIds;
-    }
-
-    public BigDecimal getCropInitialvalue() {
-        return cropInitialvalue;
-    }
-
-    public void setCropInitialvalue(BigDecimal cropInitialvalue) {
-        this.cropInitialvalue = cropInitialvalue;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("cropId", getCropId())
-            .append("cropName", getCropName())
-            .append("cropType", getCropType())
-            .append("cropMaintype", getCropMaintype())
-            .append("cropRcmdstatus", getCropRcmdstatus())
-            .append("cropPreview", getCropPreview())
-            .append("cropRemark", getCropRemark())
-            .append("resIds", getResIds())
-            .toString();
-    }
-}

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

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -15,7 +14,7 @@ import java.math.BigDecimal;
  * @date 2023-05-15
  */
 @Data
-public class FmsLand extends BaseEntity
+public class FmsLand extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -83,5 +82,6 @@ public class FmsLand extends BaseEntity
 
     private Integer landSeq;
 
+    private String tid;
 
 }