Merge branch 'hotfix-28747-20220622' into release

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

@@ -1,10 +1,15 @@
 package com.fdkankan.scene.controller;
 
+import com.dtflys.forest.annotation.Post;
 import com.fdkankan.common.controller.BaseController;
 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.MoveSceneParamVO;
+import com.fdkankan.scene.vo.UnbindOrBindCameraParamVO;
 import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +35,8 @@ public class V3Controller extends BaseController {
     private ISceneUpgradeToV4Service sceneUpgradeToV4Service;
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private IScenePlusService scenePlusService;
 
     /**
      * <p>
@@ -75,5 +82,32 @@ public class V3Controller extends BaseController {
         return sceneUpgradeToV4Service.getSceneViewInfo(num);
     }
 
+    /**
+     * <p>
+            v3相机解绑和绑定，需要同步v4场景的userid
+     * </p>
+     * @author dengsixing
+     * @date 2022/6/23
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @PostMapping(value = "/updateScenePlusUserIdByCameraId")
+    public ResultData updateScenePlusUserIdByCameraId(@RequestBody @Validated UnbindOrBindCameraParamVO param){
+        return scenePlusService.updateScenePlusUserIdByCameraId(param.getCameraIdList(), param.getUserId());
+    }
+
+    /**
+     * <p>
+            场景迁移，修改相机id和用户id
+     * </p>
+     * @author dengsixing
+     * @date 2022/6/23
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @PostMapping(value = "/moveScene")
+    public ResultData moveScene(
+        @RequestBody @Validated MoveSceneParamVO param){
+        return scenePlusService.moveScene(param.getNumList(), param.getCameraId(), param.getUserId());
+    }
+
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import java.util.List;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
@@ -23,5 +25,11 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
 
+    ResultData updateScenePlusUserIdByCameraId(List<Long> cameraIdList, Long userId);
+
+    ResultData moveScene(List<String> numList, Long cameraId, Long userId);
+
+
+
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.exception.BusinessException;
@@ -18,6 +19,7 @@ import com.fdkankan.scene.service.IScenePlusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import java.util.Calendar;
+import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,4 +95,24 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         return ResultData.ok();
     }
+
+    @Override
+    public ResultData updateScenePlusUserIdByCameraId(List<Long> cameraIdList, Long userId) {
+        LambdaUpdateWrapper<ScenePlus> updateWrapper = new LambdaUpdateWrapper<ScenePlus>()
+            .set(ScenePlus::getUserId, userId).in(ScenePlus::getCameraId, cameraIdList);
+        this.update(updateWrapper);
+        return ResultData.ok();
+    }
+
+    @Override
+    public ResultData moveScene(List<String> numList, Long cameraId, Long userId) {
+        LambdaUpdateWrapper<ScenePlus> updateWrapper =
+            new LambdaUpdateWrapper<ScenePlus>()
+                .set(ScenePlus::getUserId, userId)
+                .set(ScenePlus::getCameraId, cameraId)
+                .in(ScenePlus::getNum, numList);
+        this.update(updateWrapper);
+        return ResultData.ok();
+
+    }
 }

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

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

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 = "cameraIdList不能为空")
+    private List<Long> cameraIdList;
+
+    private Long userId;
+
+}