阶段提交：iotm ,iots

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdServiceImpl.java

@@ -93,7 +93,7 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
             // 如果测报灯配置为空，则新增测报灯配置
             iotDeviceconfig = new IotDeviceconfig();
             iotDeviceconfig.setDevcfgBid(iotDeviceconfig.getUUId());
-            iotDeviceconfig.setCId(iotDevice.getTid());
+            iotDeviceconfig.setTid(iotDevice.getTid());
             iotDeviceconfig.setDevBid(iotCbdConfigEditReqVo.getCdbdataBid());
             iotDeviceconfig.setDevcfgContext(JSONUtils.toJSONString(iotCbdConfigEditReqVo.getIotCbdConfig()));
             iotDeviceconfig.setDevcfgDelstatus("0");
@@ -139,7 +139,7 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
         }
 
         IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
-        iotDeviceconfig.setCId(iotDevice.getTid());
+        iotDeviceconfig.setTid(iotDevice.getTid());
         iotDeviceconfig.setDevBid(devBid);
 
         CmdGroupModel cmdGroupModel = iIotDeviceconfigService.createTakePhotoCmd(iotDeviceconfig);
@@ -168,7 +168,7 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
         payload.put("cmd", "read");
         payload.put("ext", "data");
         IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
-        iotDeviceconfig.setCId(iotDevice.getTid());
+        iotDeviceconfig.setTid(iotDevice.getTid());
         iotDeviceconfig.setDevBid(devBid);
         iotDeviceconfig.setDevcfgContext(JSONUtils.toJSONString(payload));
 

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdrecogServiceImpl.java

@@ -279,7 +279,7 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
 
             // 保存 测报灯图片识别和虫情信息关联信息
             IotCbdpest iotCbdpest = new IotCbdpest();
-            iotCbdpest.setCId(iotDevice.getTid());
+            iotCbdpest.setTid(iotDevice.getTid());
             iotCbdpest.setCbdpestBid(iotCbdpest.getUUId());
             iotCbdpest.setPestrecogBid(iotPestrecog.getPestrecogBid());
             iotCbdpest.setCbdrecogBid(iotCbdrecog.getCbdrecogBid());

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/IotDeviceListReqVo.java

@@ -1,12 +1,13 @@
 package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class IotDeviceListReqVo {
+public class IotDeviceListReqVo extends IotDevice {
     /** 设备编号 */
     @Excel(name = "设备编号")
     private String devCode;

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotCmdlogServiceImpl.java

@@ -36,7 +36,7 @@ public class IotCmdlogServiceImpl implements IIotCmdlogService
 
         IotCmdlog iotCmdlog = new IotCmdlog();
         iotCmdlog.setClogBid(iotCmdlog.getUUId());
-        iotCmdlog.setCId(iotDevice.getTid());
+        iotCmdlog.setTid(iotDevice.getTid());
         iotCmdlog.setCtBid(cmdModel.getCtBid());
         iotCmdlog.setCeBid(cmdModel.getCeBid());
         iotCmdlog.setDevBid(iotDevice.getDevBid());

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotCmdtaskServiceImpl.java

@@ -107,7 +107,7 @@ public class IotCmdtaskServiceImpl implements IIotCmdtaskService {
         log.info("【处理指令集】1{}", cmdGroupModel);
         // 根据CmdGroupModel创建task任务
         IotCmdtask iotCmdtask = new IotCmdtask();
-        iotCmdtask.setCId(cmdGroupModel.getCId());
+        iotCmdtask.setTid(cmdGroupModel.getTid());
         iotCmdtask.setCtBid(iotCmdtask.getUUId());
         iotCmdtask.setCtStatus(CmdgroupStatus.CM_STATUS_RUNNING.getCode());
         iotCmdtask.setCtStartddate(DateUtils.dateTimeNow());

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotDeviceconfigServiceImpl.java

@@ -194,7 +194,7 @@ public class IotDeviceconfigServiceImpl implements IIotDeviceconfigService {
 
     public CmdGroupModel createCmd(IotDeviceconfig iotDeviceconfig, String func) {
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
-        cmdGroupModel.setCId(iotDeviceconfig.getCId());
+        cmdGroupModel.setTid(iotDeviceconfig.getTid());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
         cmdModel.setDeviceId(iotDeviceconfig.getDevBid());
@@ -213,7 +213,7 @@ public class IotDeviceconfigServiceImpl implements IIotDeviceconfigService {
     @Override
     public CmdGroupModel createTakePhotoCmd(IotDeviceconfig iotDeviceconfig) {
         CmdGroupModel cmdGroupModel = new CmdGroupModel();
-        cmdGroupModel.setCId(iotDeviceconfig.getCId());
+        cmdGroupModel.setTid(iotDeviceconfig.getTid());
         cmdGroupModel.setCmdModels(new LinkedList<>());
         CmdModel cmdModel = new CmdModel();
         cmdModel.setDeviceId(iotDeviceconfig.getDevBid());