lyhzzz пре 2 година
родитељ
комит
b20e42ff20

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

@@ -394,7 +394,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         //深时场景无限容量
-        if(cameraDetail.getType() != 10 && totalSpace !=-1 &&  newUseSpace  > totalSpace){
+        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && totalSpace !=-1 &&  newUseSpace  > totalSpace){
             throw new BusinessException(ResultCode.CAMERA_SPACE_ERROR);
         }
 
@@ -417,13 +417,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         oldCameraDetail.setUsedSpace(oldUseSpace);
         Long subSpace =  oldCameraDetail.getTotalSpace() - oldUseSpace;
 
-        if(oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(oldCameraDetail,oldCameraDetail.getCameraId(),1);
         }
 
         Integer payStatus =  scenePro == null ? scenePlus.getPayStatus() : scenePro.getPayStatus();
 
-        if(cameraDetail.getType() != 10 && payStatus!=1){           //有剩余容量解封容量内场景
+        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && payStatus!=1){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(scenePro,scenePlus,1);
         }
         cameraDetailService.updateById(oldCameraDetail);
@@ -453,7 +453,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         //协作相机
         sceneResourceCameraService.setCooperationUser(cameraDetail,param.getNum());
-        if(cameraDetail.getType() == 10){       //深时场景
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){       //深时场景
             laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId());
         }
         updateFdageNewDataSource(scenePro,scenePlus,oldCamera.getSnCode(),param.getSnCode(),dataSource);
@@ -610,7 +610,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             scenePlusService.removeById(scenePlus.getId());
         }
-        if(sceneSource != null && sceneSource == 4){
+        if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
         if(cameraId != null){