Merge branch 'usky-zyj' into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -183,28 +183,28 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             }
 
             DmpTopicResponseVO add = new DmpTopicResponseVO();
-            add.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.ADD_REMARKS.getLetter());
+            add.setTopic("/usky/devices/" + deviceUuid + "/" + TopicInfo.ADD_REMARKS.getLetter());
             add.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             add.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             add.setRemarks(TopicInfo.ADD_REMARKS.getValue());
             responseVOList.add(add);
 
             DmpTopicResponseVO info = new DmpTopicResponseVO();
-            info.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.INFO_REMARKS.getLetter());
+            info.setTopic("/usky/devices/" + deviceUuid + "/" + TopicInfo.INFO_REMARKS.getLetter());
             info.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             info.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             info.setRemarks(TopicInfo.INFO_REMARKS.getValue());
             responseVOList.add(info);
 
             DmpTopicResponseVO control = new DmpTopicResponseVO();
-            control.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_REMARKS.getLetter());
+            control.setTopic("/usky/devices/" + deviceUuid + "/" + TopicInfo.CONTROL_REMARKS.getLetter());
             control.setSubscriber(TopicInfo.GATEWAY_DEVICE.getValue());
             control.setPublisher(TopicInfo.IOT_PLATFORM.getValue());
             control.setRemarks(TopicInfo.CONTROL_REMARKS.getValue());
             responseVOList.add(control);
 
             DmpTopicResponseVO controlResponse = new DmpTopicResponseVO();
-            controlResponse.setTopic("/" + deviceUuid + "/" + TopicInfo.CONTROL_RESPONSE_REMARKS.getLetter());
+            controlResponse.setTopic("/usky/devices/" + deviceUuid + "/" + TopicInfo.CONTROL_RESPONSE_REMARKS.getLetter());
             controlResponse.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             controlResponse.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             controlResponse.setRemarks(TopicInfo.CONTROL_RESPONSE_REMARKS.getValue());