阶段提交：iotm ,iots

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

@@ -15,7 +15,7 @@ public class IotCbddata extends IotBaseEntity{
 
     private String id;
 
-    private String cId;
+    private String tid;
 
     private String cdbdataBid;
 

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

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * 测报灯图片基础对象 IotCbdimg
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -25,7 +25,7 @@ public class IotCbdimg extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /** 设备业务标识 */
     @Excel(name = "设备业务标识")

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

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * 测报灯虫情信息关联对象 IotCbdpest
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -25,7 +25,7 @@ public class IotCbdpest extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /** 虫情识别信息业务标识 */
     @Excel(name = "虫情识别信息业务标识")

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

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * 测报灯图片识别对象 IotCbdrecog
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -25,7 +25,7 @@ public class IotCbdrecog extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /** 图片基础业务标识 */
     @Excel(name = "图片基础业务标识")

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * 指令执行对象 IotCmdexec
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -24,7 +24,7 @@ public class IotCmdexec extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /** 任务标识 */
     @Excel(name = "任务标识")

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

@@ -7,7 +7,7 @@ import lombok.Data;
 
 /**
  * 指令执行日志对象 IotCmdlog
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -26,7 +26,8 @@ public class IotCmdlog extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
+
 
     /** 任务标识 */
     @Excel(name = "任务标识")

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

@@ -22,7 +22,7 @@ public class IotCmdtask extends IotBaseEntity {
      * 客户id
      */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /**
      * 任务业务标识

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

@@ -7,7 +7,7 @@ import lombok.Data;
 
 /**
  * 设备基础对象 IotDevice
- * 
+ *
  * @author 杨晓辉
  * @date 2024-11-06
  */
@@ -162,4 +162,7 @@ public class IotDevice extends IotBaseEntity
     /** 删除状态 */
     @Excel(name = "删除状态")
     private String devDelstatus;
+    private String devOnlinedate;
+    private String extInfo;
+    private String devSubtype;
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * 设备配置对象 IotDeviceconfig
- * 
+ *
  * @author 杨晓辉
  * @date 2024-01-04
  */
@@ -23,7 +23,7 @@ public class IotDeviceconfig extends IotBaseEntity
 
     /** 客户id */
     @Excel(name = "客户id")
-    private String cId;
+    private String tid;
 
     /** 设备业务标识 */
     @Excel(name = "设备业务标识")

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

@@ -40,5 +40,6 @@ public class IotDeviceCtrlReqVo {
     private IotDeviceCtrlReqVo delayIotDeviceCtrlReqVo;
 
     private IotDeviceResVo iotDeviceResVo;
+    private String tid;
 
 }

src/main/java/com/yunfeiyun/agmp/iot/common/model/cmd/CmdGroupModel.java

@@ -18,6 +18,7 @@ public class CmdGroupModel {
     private String taskDesc;
 
     private String cId;
+    private String tid;
 
     /**
      * 串行指令集合

src/main/java/com/yunfeiyun/agmp/iot/common/model/cmd/CmdGroupModelUtil.java

@@ -21,7 +21,7 @@ public class CmdGroupModelUtil {
     public static CmdGroupModel createCtrlCmd(IotDeviceCtrlReqVo iotDeviceCtrlReqVo, String func) {
 
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
-        cmdGroupModel.setCId(CustomerIdUtil.getCustomerId());
+        cmdGroupModel.setTid(iotDeviceCtrlReqVo.getTid());
         cmdGroupModel.setReceiptAddr(iotDeviceCtrlReqVo.getReceiptAddr());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         cmdGroupModel.setTaskUuid(IdUtils.fastUUID());