新增 吸虫塔设备对接

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

@@ -0,0 +1,26 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import lombok.Data;
+
+/**
+ * mongo
+ * 虫情测报基础表, 设备上报数据 用于具体设备继承
+ */
+@Data
+public class CbdBaseDataEntity extends IotBaseEntity{
+
+    public String id;
+
+    public String tid;
+
+    public String cdbdataBid;
+
+    public String devBid;
+
+    public JSONObject cdbdataContent;
+
+    public String cbddataCreatedDate;
+
+}

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

@@ -1,9 +1,8 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 
-import com.alibaba.fastjson2.JSONObject;
-import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 /**
  * mongo
@@ -11,18 +10,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
  */
 @Data
 @TableName("IotCbddata")
-public class IotCbddata extends IotBaseEntity{
-
-    private String id;
-
-    private String tid;
-
-    private String cdbdataBid;
-
-    private String devBid;
-
-    private JSONObject cdbdataContent;
-
-    private String cbddataCreatedDate;
+public class IotCbddata extends CbdBaseDataEntity {
 
 }

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

@@ -1,42 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yunfeiyun.agmp.common.annotation.Excel;
-import lombok.Data;
-
-/**
- * 测报灯虫情信息关联对象 IotCbdpest
- *
- * @author 杨晓辉
- * @date 2024-01-04
- */
-@Data
-@TableName("IotCbdpest")
-public class IotCbdpest extends IotBaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    private String id;
-
-    /** 测报灯虫情信息关联表业务标识 */
-    @Excel(name = "测报灯虫情信息关联表业务标识")
-    private String cbdpestBid;
-
-    /** 客户id */
-    @Excel(name = "客户id")
-    private String tid;
-
-    /** 虫情识别信息业务标识 */
-    @Excel(name = "虫情识别信息业务标识")
-    private String pestrecogBid;
-
-    /** 图片识别业务标识 */
-    @Excel(name = "图片识别业务标识")
-    private String cbdrecogBid;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String cbdpestCreatedDate;
-
-}

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

@@ -0,0 +1,16 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * mongo
+ * 吸虫塔上报数据
+ * 吸虫塔是测报灯的一种
+ */
+@Data
+@TableName("IotXctdata")
+public class IotXctdata extends CbdBaseDataEntity {
+
+}

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

@@ -1,10 +0,0 @@
-package com.yunfeiyun.agmp.iot.common.domain.reqvo;
-
-import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
-import lombok.Data;
-
-@Data
-public class IotCbddataReqVo extends IotCbddata {
-    private String startDate;
-    private String endDate;
-}