|
@@ -250,7 +250,7 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Map<String,Object> control(String productCode, String deviceUuid, String commandCode, String commandValue, String domain, Long userId, String userName){
|
|
|
+ public Map<String,Object> control(String productCode, String deviceUuid, String commandCode, String commandValue, String domain, Long userId, String userName, Integer categoryType, String gatewayUuid){
|
|
|
Integer tenantId;
|
|
|
long commandUserId;
|
|
|
String commandUserName;
|
|
@@ -290,11 +290,16 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
|
|
|
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
map.put("method","control");
|
|
|
+ map.put("deviceUuid", deviceUuid);
|
|
|
Map<String,Object> map1 = new HashMap<>();
|
|
|
map1.put("commandCode",commandCode);
|
|
|
map1.put("commandValue",commandValue);
|
|
|
map.put("params",map1);
|
|
|
|
|
|
- return remoteTransferService.deviceControl(productCode,deviceUuid, JSON.toJSONString(map),tenantId,commandUserId,commandUserName);
|
|
|
+ if(categoryType == 3){
|
|
|
+ return remoteTransferService.deviceControl(productCode, gatewayUuid, JSON.toJSONString(map), tenantId, commandUserId, commandUserName);
|
|
|
+ }else{
|
|
|
+ return remoteTransferService.deviceControl(productCode, deviceUuid, JSON.toJSONString(map), tenantId, commandUserId, commandUserName);
|
|
|
+ }
|
|
|
}
|
|
|
}
|