Merge branch 'hotfix-28747-20220622' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -6,6 +6,7 @@ import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
+import com.fdkankan.scene.vo.UnbindOrBindCameraParamVO;
 import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,14 +87,11 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/6/23
-     * @param cameraIdList
-     * @param userId
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/updateScenePlusUserIdByCameraId")
-    public ResultData updateScenePlusUserIdByCameraId(
-        @RequestParam(value = "cameraIdList") List<Long> cameraIdList, Long userId){
-        return scenePlusService.updateScenePlusUserIdByCameraId(cameraIdList, userId);
+    public ResultData updateScenePlusUserIdByCameraId(@RequestBody @Validated UnbindOrBindCameraParamVO param){
+        return scenePlusService.updateScenePlusUserIdByCameraId(param.getCameraIdList(), param.getUserId());
     }
 
     /**
@@ -102,7 +100,6 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/6/23
-     * @param num
      * @param cameraId
      * @param userId
      * @return com.fdkankan.common.response.ResultData

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/UnbindOrBindCameraParamVO.java

@@ -0,0 +1,24 @@
+package com.fdkankan.scene.vo;
+
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/21
+ **/
+@Data
+public class UnbindOrBindCameraParamVO {
+
+    @NotNull(message = "相机id不能为空")
+    private List<Long> cameraIdList;
+
+    private Long userId;
+
+}