|
@@ -660,26 +660,26 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
if(detailEntity == null){
|
|
|
throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
|
|
|
}
|
|
|
- UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
|
|
|
- if(userIncrement == null){
|
|
|
- throw new BusinessException(LoginConstant.FAILURE_CODE_3030, LoginConstant.FAILURE_MSG_3030);
|
|
|
- }
|
|
|
- IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
|
- if(incrementType == null){
|
|
|
- throw new BusinessException(LoginConstant.FAILURE_CODE_3030, LoginConstant.FAILURE_MSG_3030);
|
|
|
- }
|
|
|
- if(incrementType.getCameraCapacity() != -1){
|
|
|
- Long usedSpace = detailEntity.getUsedSpace();
|
|
|
- if( scenePro != null && scenePro.getSpace() + usedSpace > incrementType.getCameraCapacity() * 1024 * 1024 * 1024L){
|
|
|
- throw new BusinessException(CameraConstant.FAILURE_CODE_6008, CameraConstant.FAILURE_MSG_6008);
|
|
|
- }
|
|
|
- if( scenePlus != null ){
|
|
|
- ScenePlusExt ext = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
|
- if(ext.getSpace() + usedSpace > incrementType.getCameraCapacity() * 1024 * 1024 * 1024L){
|
|
|
- throw new BusinessException(CameraConstant.FAILURE_CODE_6008, CameraConstant.FAILURE_MSG_6008);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
|
|
|
+// if(userIncrement == null){
|
|
|
+// throw new BusinessException(LoginConstant.FAILURE_CODE_3030, LoginConstant.FAILURE_MSG_3030);
|
|
|
+// }
|
|
|
+// IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
|
+// if(incrementType == null){
|
|
|
+// throw new BusinessException(LoginConstant.FAILURE_CODE_3030, LoginConstant.FAILURE_MSG_3030);
|
|
|
+// }
|
|
|
+// if(incrementType.getCameraCapacity() != -1){
|
|
|
+// Long usedSpace = detailEntity.getUsedSpace();
|
|
|
+// if( scenePro != null && scenePro.getSpace() + usedSpace > incrementType.getCameraCapacity() * 1024 * 1024 * 1024L){
|
|
|
+// throw new BusinessException(CameraConstant.FAILURE_CODE_6008, CameraConstant.FAILURE_MSG_6008);
|
|
|
+// }
|
|
|
+// if( scenePlus != null ){
|
|
|
+// ScenePlusExt ext = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
|
+// if(ext.getSpace() + usedSpace > incrementType.getCameraCapacity() * 1024 * 1024 * 1024L){
|
|
|
+// throw new BusinessException(CameraConstant.FAILURE_CODE_6008, CameraConstant.FAILURE_MSG_6008);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
String newNum = scene3dNumService.generateSceneNum(detailEntity.getType());
|
|
|
String title = scenePro == null ? scenePlus.getTitle() : scenePro.getSceneName();
|