新增 性诱测报2.0业务端对接

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

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -11,18 +10,6 @@ import lombok.Data;
  */
 @Data
 @TableName("IotYfXycb2data")
-public class IotYfXycb2data extends IotBaseEntity{
-
-    private String id;
-
-    private String cId;
-
-    private String xycb2dataBid;
-
-    private String devBid;
-
-    private JSONObject xycb2dataContent;
-
-    private String xycb2dataCreatedDate;
+public class IotYfXycb2data extends IotYfXycbdata {
 
 }

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

@@ -6,10 +6,10 @@ import lombok.Data;
 
 /**
  * mongo
- * 性诱测报灯2.0
+ * 性诱测报灯III
  */
 @Data
 @TableName("IotYfXycbIIIdata")
-public class IotYfXycbIIIdata extends IotYfXycbdata{
+public class IotYfXycbIIIdata extends IotYfXycbdata {
 
 }

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

@@ -40,6 +40,10 @@ public class TosDevicetype extends IotBaseEntity {
     @Excel(name = "型号图示")
     private String devtypePreview;
 
+    /** 型号地图图标 */
+    @Excel(name = "型号地图图标")
+    private String devtypeMapicon;
+
     /** 备注 */
     @Excel(name = "备注")
     private String devtypeRemark;