|
@@ -220,6 +220,9 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
|
|
|
responseVOList.add(controlResponse);
|
|
|
}else{
|
|
|
String gatewayUuid = requestVO.getGatewayUuid();
|
|
|
+ if(categoryType == 2){
|
|
|
+ gatewayUuid = requestVO.getDeviceUuid();
|
|
|
+ }
|
|
|
|
|
|
DmpTopicResponseVO add = new DmpTopicResponseVO();
|
|
|
add.setTopic("/usky/devices/" + gatewayUuid + "/add");
|
|
@@ -373,6 +376,9 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
|
|
|
}
|
|
|
}else{
|
|
|
String gatewayUuid = requestVO.getGatewayUuid();
|
|
|
+ if(categoryType == 2){
|
|
|
+ gatewayUuid = requestVO.getDeviceUuid();
|
|
|
+ }
|
|
|
switch (topicType) {
|
|
|
case "add":
|
|
|
/*if (StringUtils.isBlank(productCode)) {
|