1

src/main/java/com/fdkankan/ucenter/controller/api/MangeApiController.java

@@ -15,11 +15,11 @@ public class MangeApiController extends BaseController {
     ISceneProService sceneProService;
 
     @GetMapping("/_copy_scene")
-    public ResultData copyScene(@RequestParam(required = false) String num) throws Exception {
+    public ResultData copyScene(@RequestParam(required = false) String num,@RequestParam(required = false) Integer sourceId) throws Exception {
         if(!"m_a_n_a_g_e".equals(getSign())){
             return ResultData.error(-1,"无权过问");
         }
-        sceneProService.copySceneNoCheck(num);
+        sceneProService.copySceneNoCheck(num,sourceId);
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/ucenter/mq/consumer/CopySceneConsumer.java

@@ -36,7 +36,8 @@ public class CopySceneConsumer {
             JSONObject jsonObject = JSONObject.parseObject(msg);
             String oldNum = jsonObject.getString("oldNum");
             String newNum = jsonObject.getString("newNum");
-            sceneCopyService.copyScene(oldNum,newNum);
+            Integer sourceId = jsonObject.getInteger("sourceId");
+            sceneCopyService.copyScene(oldNum,newNum,sourceId);
         }catch (Exception e){
             log.info("copy-scene----消费失败",e);
         }

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -77,7 +77,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void updateDbViewCount(String num, String count);
 
-    void copySceneNoCheck(String sceneNum) throws Exception;
+    void copySceneNoCheck(String sceneNum,Integer sourceId) throws Exception;
 
     ResponseScene getSceneDetail(String sceneNum);
 

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -112,8 +112,6 @@ public class AppCameraService {
         cameraIncrementLogService.saveLog(camera.getId(),null,user.getId(),2);
 
         cameraDetailService.bindCamera(cameraIds,user);
-        sceneProService.bindOrUnCamera(cameraIds,user.getId());
-        scenePlusService.bindOrUnCamera(cameraIds,user.getId());
         CameraAppVo responseCamera = new CameraAppVo();
         responseCamera.setChildName(camera.getChildName());
         responseCamera.setUnit(cameraDetail.getUnit());
@@ -154,10 +152,7 @@ public class AppCameraService {
         }
         cameraIncrementLogService.saveLog(camera.getId(),null,user.getId(),3);
 
-        userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
         cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
-        sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景
-        scenePlusService.bindOrUnCamera(cameraIds,null);            //取消关联场景
     }
 
     public CameraAppVo getCameraInfo(String childName, String childPassword) {

src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -118,44 +118,11 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             wrapper.set(CameraDetail::getUserId,null);
             wrapper.set(CameraDetail::getCooperationUser,null);
             this.update(wrapper);
-            CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
-
-            //国内服解绑
-            if(!"aws".equals(NacosProperty.uploadType) && !"local".equals(NacosProperty.uploadType) && cameraType.getIsLaser() ==0){
-                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());     //封存场景
-            }
-            //国际服解绑
-            if("aws".equals(NacosProperty.uploadType) ){
-                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());     //封存场景
-            }
-            if (cameraType.getIsLaser() == 1) {
-                fdkkLaserService.toBind(false,cameraMap.get(cameraDetail.getCameraId()).getSnCode(),null,null);
-            }
         }
         //恢复10G基本容量
 
         //删除场景协作信息
-        List<ScenePro> sceneProList = sceneProService.getListByCameraIds(cameraIds);
-        List<ScenePlus> scenePlusList = scenePlusService.getListByCameraIds(cameraIds);
-        sceneCooperationService.deleteCooperationList(sceneProList,scenePlusList);
         fdkkLaserService.disableCooperation(detailMap, cameraMap);
-        //解绑删除相机。文件夹与场景绑定关系
-        List<Long > sceneIds = new ArrayList<>();
-        if(sceneProList.size() >0){
-            List<Long> proIds = sceneProList.stream().map(ScenePro::getId).collect(Collectors.toList());
-            if(proIds.size() >0){
-                sceneIds.addAll(proIds);
-            }
-        }
-        if(scenePlusList.size() >0){
-            List<Long> plusIds = scenePlusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
-            if(plusIds.size() >0){
-                sceneIds.addAll(plusIds);
-            }
-        }
-        if(sceneIds.size() >0){
-            folderSceneService.delBySceneId(sceneIds);
-        }
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -273,13 +273,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (String id : split) {
             cameraIds.add(Long.valueOf(id));
         }
-        cameraIncrementLogService.saveLog(cameraIds,userName);
-        userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
         cameraDetailService.unbindCamera(cameraIds);                    //取消相机用户关联
-        sceneService.bindOrUnCamera(cameraIds,null);                //取消关联场景
-        sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景
-        scenePlusService.bindOrUnCamera(cameraIds,null);            //取消关联场景
-        sceneResourceCameraService.deleteByCameraIds(cameraIds);       //删除协作相机
 
     }
 
@@ -312,9 +306,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         cameraIncrementLogService.saveLog(cameraIds,null,user.getId(),2);
 
         cameraDetailService.bindCamera(cameraIds,user);
-        sceneService.bindOrUnCamera(cameraIds,user.getId());
-        sceneProService.bindOrUnCamera(cameraIds,user.getId());
-        scenePlusService.bindOrUnCamera(cameraIds,user.getId());
 
         if("local".equals(NacosProperty.uploadType)){   //局域网绑定相机，添加权益
             userIncrementService.addByCameraAndUser(cameraIds,user.getId());

src/main/java/com/fdkankan/ucenter/service/impl/SceneCopyServiceImpl.java

@@ -54,18 +54,18 @@ public class SceneCopyServiceImpl {
     FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     RabbitMqProducer rabbitMqProducer;
-    public void copyScene(String oldNum, String newNum) {
+    public void copyScene(String oldNum, String newNum,Integer sourceId) {
         ScenePro scenePro = sceneProService.getByNum(oldNum);
         if(scenePro != null && scenePro.getIsUpgrade() == 0){
             cpV3(scenePro,oldNum,newNum);
         }
         ScenePlus scenePlus = scenePlusService.getByNum(oldNum);
         if(scenePlus != null){
-            cpV4(scenePlus,oldNum,newNum);
+            cpV4(scenePlus,oldNum,newNum,sourceId);
         }
     }
 
-    private void cpV4(ScenePlus scenePlus, String oldNum, String newNum) {
+    private void cpV4(ScenePlus scenePlus, String oldNum, String newNum,Integer sourceId) {
         try {
             Long plusId = scenePlus.getId();
             ScenePlusExt plusExt = scenePlusExtService.getByPlusId(plusId);
@@ -76,6 +76,7 @@ public class SceneCopyServiceImpl {
             scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
             scenePlus.setSceneStatus(0);
             scenePlus.setId(null);
+            scenePlus.setSceneSource(sourceId);
             scenePlusService.save(scenePlus);
 
             this.saveFolder(plusId,scenePlus.getId());

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -701,15 +701,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(!canSpace){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6008, CameraConstant.FAILURE_MSG_6008);
         }
-        copyScene(sceneNum,scenePro,scenePlus);
+        copyScene(sceneNum,null,scenePro,scenePlus);
 
     }
 
     @Override
-    public synchronized void copySceneNoCheck(String sceneNum) throws Exception {
+    public synchronized void copySceneNoCheck(String sceneNum,Integer sourceId) throws Exception {
         ScenePro scenePro = this.getByNum(sceneNum);
         ScenePlus scenePlus = scenePlusService.getByNum(sceneNum);
-        copyScene(sceneNum,scenePro,scenePlus);
+        copyScene(sceneNum,sourceId,scenePro,scenePlus);
     }
 
     @Autowired
@@ -718,13 +718,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Value("${queue.scene.copy:ucenter-copy-scene}")
     private String copySceneQueue;
 
-    private void copyScene(String oldNum,ScenePro scenePro,ScenePlus scenePlus) throws Exception {
+    private void copyScene(String oldNum,Integer sourceId,ScenePro scenePro,ScenePlus scenePlus) throws Exception {
         String newNum = scene3dNumService.generateSceneNum(oldNum);
         Long userId = scenePro == null ? scenePlus.getUserId() :scenePro.getUserId();
         sceneCopyLogService.saveByNum(oldNum,newNum,userId);
-        HashMap<String,String > map = new HashMap<>();
+        HashMap<String,Object > map = new HashMap<>();
         map.put("oldNum",oldNum);
         map.put("newNum",newNum);
+        map.put("sourceId",sourceId);
         rabbitMqProducer.sendByWorkQueue(copySceneQueue,map);
     }