Merge remote-tracking branch 'origin/master_dev' into master_dev

xp.Huang
2 parents 559ea500 2be82ac4
Showing 1 changed file with 1 additions and 1 deletions
application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @40685e0
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @40685e0
@@ -97,7 +97,7 @@ public abstract class AbstractRpcController extends BaseController {
             String additionalInfo =  JacksonUtil.toString(additional);
             String methodName = rpcRequestBody.get(FastIotConstants.Rpc.METHOD_NAME).asText();
             JsonNode params = rpcRequestBody.get(FastIotConstants.Rpc.PARAMS_NAME);
-            if(params!=null && !params.isTextual()){
+            if(DeviceTypeEnum.SENSOR == targetDevice.getDeviceType() && params!=null && !params.isTextual()){
                 ObjectNode methodParams = (ObjectNode) rpcRequestBody.get(FastIotConstants.Rpc.PARAMS_NAME);
                 methodParams.put(FastIotConstants.Rpc.TARGET_NAME,targetDevice.getName());
             }