Commit b3b6e64c86989f329086e73c2e9ba6745e5a9761

Authored by xp.Huang
2 parents 4f40c498 db78ac2b

Merge branch 'cherry-pick-6ac2a485' into 'master_dev'

fix:云台控制传参参数错误

See merge request yunteng/thingskit!315
@@ -116,7 +116,7 @@ public class TkVideoController extends BaseController { @@ -116,7 +116,7 @@ public class TkVideoController extends BaseController {
116 @GetMapping("controlling") 116 @GetMapping("controlling")
117 @ApiOperation("云台操作") 117 @ApiOperation("云台操作")
118 public ResponseResult<String> controlling( 118 public ResponseResult<String> controlling(
119 - @RequestParam(value = "organizationId", required = false) String organizationId, 119 + @RequestParam(value = "cameraIndexCode", required = false) String cameraIndexCode,
120 @RequestParam(value = "action", required = false)int action, 120 @RequestParam(value = "action", required = false)int action,
121 @RequestParam(value = "command", required = false) String command) 121 @RequestParam(value = "command", required = false) String command)
122 throws ThingsboardException { 122 throws ThingsboardException {
@@ -125,7 +125,7 @@ public class TkVideoController extends BaseController { @@ -125,7 +125,7 @@ public class TkVideoController extends BaseController {
125 getCurrentUser().isTenantAdmin(), 125 getCurrentUser().isTenantAdmin(),
126 getCurrentUser().getCurrentUserId(), 126 getCurrentUser().getCurrentUserId(),
127 getCurrentUser().getCurrentTenantId(), 127 getCurrentUser().getCurrentTenantId(),
128 - organizationId, 128 + cameraIndexCode,
129 action, 129 action,
130 command 130 command
131 )); 131 ));