调整设备编辑重新初始化连接逻辑

src/main/java/com/yunfeiyun/agmp/iotm/mq/service/SendToIotsMsgService.java

@@ -6,6 +6,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevicetype;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
+import com.yunfeiyun.agmp.iot.common.model.mq.IotDeviceEditMqModel;
 import com.yunfeiyun.agmp.iotm.mq.provider.IotsMqProviderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -37,8 +38,8 @@ public class SendToIotsMsgService {
      *
      * @param iotDevice
      */
-    public void sendIotDeviceUpdateMsg(IotDevice iotDevice) {
-        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_UPDATE, iotDevice, "【Iotm】to【Iots】物联网编辑设备，同步到Iots");
+    public void sendIotDeviceUpdateMsg(IotDeviceEditMqModel iotDeviceEditMqModel) {
+        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_UPDATE, iotDeviceEditMqModel, "【Iotm】to【Iots】物联网编辑设备，同步到Iots");
 
     }
 

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

@@ -13,6 +13,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceDelStatusEnum;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
+import com.yunfeiyun.agmp.iot.common.model.mq.IotDeviceEditMqModel;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
 import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
@@ -282,13 +283,17 @@ public class IotDeviceServiceImpl implements IIotDeviceService
      */
     @Override
     public int updateIotDevice(IotDevice iotDevice, IotDeviceconn oldDeviceconn, IotDeviceconn newDeviceconn){
+        IotDevice oldDevice = iotDeviceMapper.selectIotDeviceByDevBid(iotDevice.getDevBid());
         int result = iotDeviceMapper.updateIotDevice(iotDevice);
         // 同步修改设备到TOS
         sendToTosMsgService.sendIotDeviceUpdateMsg(iotDevice);
         if(oldDeviceconn != null && newDeviceconn != null){
             // 解除旧连接订阅 串行
             // 订阅新连接 串行
-            sendToIotsMsgService.sendIotDeviceUpdateMsg(iotDevice);
+            IotDeviceEditMqModel iotDeviceEditMqModel = new IotDeviceEditMqModel();
+            iotDeviceEditMqModel.setOldIotDevice(oldDevice);
+            iotDeviceEditMqModel.setNewIotDevice(iotDevice);
+            sendToIotsMsgService.sendIotDeviceUpdateMsg(iotDeviceEditMqModel);
         }
         return result;
     }