Browse Source

修复bug

lyhzzz 2 years ago
parent
commit
d15a39f756

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -444,7 +444,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(id);
         if(cameraDetail !=null && cameraDetail.getUserId()!=null){
-            throw new BusinessException(ResultCode.CAMERA_DEL_ERROR);
+            this.unbindCamera(cameraDetail.getCameraId());
         }
         this.removeById(id);
         cameraDetailService.deleteByCameraId(id);

+ 10 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -337,10 +337,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
         if(scenePro!=null){
+            LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(ScenePro::getId,scenePro.getId());
+            wrapper.set(ScenePro::getCameraId,camera.getId());
+            wrapper.set(ScenePro::getUserId,cameraDetail.getUserId());
+            this.update(wrapper);
             //场景迁移到另外的相机清除本身在的文件夹
             folderSceneService.delBySceneId(scenePro.getId());
         }
         if(scenePlus!=null){
+            LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(ScenePlus::getId,scenePlus.getId());
+            wrapper.set(ScenePlus::getCameraId,camera.getId());
+            wrapper.set(ScenePlus::getUserId,cameraDetail.getUserId());
+            scenePlusService.update(wrapper);
             folderSceneService.delBySceneId(scenePlus.getId());
         }
         //协作相机