Переглянути джерело

相机解绑、绑定、迁移,需要同步用户id和相机id到v4场景表

dengsixing 3 роки тому
батько
коміт
07f29b6332

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

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

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

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

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service.impl;
 package com.fdkankan.scene.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.exception.BusinessException;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,4 +95,24 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
 
         return ResultData.ok();
         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();
+
+    }
 }
 }