liuyaowen 1 год назад
Родитель
Сommit
836f82ee54

+ 11 - 6
src/main/java/com/yunfeiyun/agmp/iotm/mq/service/SendToIotsMsgService.java

@@ -5,6 +5,7 @@ import com.yunfeiyun.agmp.iot.common.constant.mq.IotActionEnums;
 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.iotm.mq.provider.IotsMqProviderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -27,7 +28,7 @@ public class SendToIotsMsgService {
      * @param iotDevice
      */
     public void sendIotDeviceInsertMsg(IotDevice iotDevice) {
-        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_CREATE, iotDevice, "【Iotm】to【Iots】物联网新增设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_CREATE, iotDevice, "【Iotm】to【Iots】物联网新增设备,同步到Iots");
 
     }
 
@@ -37,7 +38,7 @@ public class SendToIotsMsgService {
      * @param iotDevice
      */
     public void sendIotDeviceUpdateMsg(IotDevice iotDevice) {
-        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_UPDATE, iotDevice, "【Iotm】to【Iots】物联网编辑设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_UPDATE, iotDevice, "【Iotm】to【Iots】物联网编辑设备,同步到Iots");
 
     }
 
@@ -47,7 +48,7 @@ public class SendToIotsMsgService {
      * @param iotDevice
      */
     public void sendIotDeviceDeleteMsg(IotDevice iotDevice) {
-        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_DELETE, iotDevice, "【Iotm】to【Iots】物联网删除设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.IOT_DEVICE_DELETE, iotDevice, "【Iotm】to【Iots】物联网删除设备,同步到Iots");
     }
     /**
      * 物联网新增设备型号,同步到iots ok
@@ -55,7 +56,7 @@ public class SendToIotsMsgService {
      * @param iotDeviceconn
      */
     public void sendIotDeviceconnInsertMsg(IotDeviceconn iotDeviceconn) {
-        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_CREATE, iotDeviceconn, "【Iotm】to【Iots】物联网新增设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_CREATE, iotDeviceconn, "【Iotm】to【Iots】物联网新增设备,同步到Iots");
     }
 
     /**
@@ -64,7 +65,7 @@ public class SendToIotsMsgService {
      * @param iotDeviceconn
      */
     public void sendIotDeviceconnUpdateMsg(IotDeviceconn iotDeviceconn) {
-        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_UPDATE, iotDeviceconn, "【Iotm】to【Iots】物联网编辑设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_UPDATE, iotDeviceconn, "【Iotm】to【Iots】物联网编辑设备,同步到Iots");
     }
 
     /**
@@ -73,6 +74,10 @@ public class SendToIotsMsgService {
      * @param iotDeviceconn
      */
     public void sendIotDeviceconnDeleteMsg(IotDeviceconn iotDeviceconn) {
-        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_DELETE, iotDeviceconn, "【Iotm】to【Iots】物联网删除设备,同步到Iotm");
+        mqService.sendBaseDataToIots( IotActionEnums.DEVICE_COON_DELETE, iotDeviceconn, "【Iotm】to【Iots】物联网删除设备,同步到Iots");
+    }
+    
+    public void sendCmdMsg(CmdGroupModel cmdGroupModel){
+        mqService.sendCmdToIots(cmdGroupModel,"【Iotm】 to 【iots】物联网设备指令,同步到Iots");
     }
 }