瀏覽代碼

修复迁移场景bug

lyhzzz 2 年之前
父節點
當前提交
8296e38cf0
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

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

@@ -253,6 +253,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             space = scenePlusExt.getSpace();
             space = scenePlusExt.getSpace();
         }
         }
+        space = space == null ? 0 :space;
         Long newUseSpace = space + cameraDetail.getUsedSpace();
         Long newUseSpace = space + cameraDetail.getUsedSpace();
         if(newUseSpace  > cameraDetail.getTotalSpace()){
         if(newUseSpace  > cameraDetail.getTotalSpace()){
             throw new BusinessException(-1,"相机容量不足,不能迁移");
             throw new BusinessException(-1,"相机容量不足,不能迁移");
@@ -261,7 +262,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(oldCamera == null){
         if(oldCamera == null){
             throw new BusinessException(-1,"旧相机不存在");
             throw new BusinessException(-1,"旧相机不存在");
         }
         }
-        CameraDetail oldCameraDetail = cameraDetailService.getByCameraId(camera.getId());
+        CameraDetail oldCameraDetail = cameraDetailService.getByCameraId(oldCamera.getId());
         if(oldCameraDetail == null){
         if(oldCameraDetail == null){
             throw new BusinessException(-1,"旧相机不存在。");
             throw new BusinessException(-1,"旧相机不存在。");
         }
         }