111

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -169,8 +169,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 }
             }
 
-            //用户相机重新全量上传，需要解冻结
-            sceneColdStorageService.unfreeze(num, "用户相机重新全量上传", message.getPath());
+//            //用户相机重新全量上传，需要解冻结
+//            sceneColdStorageService.unfreeze(num, "用户相机重新全量上传", message.getPath());
 
             //根据相机类型，组装资源路径
             //下载资源到本地

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -448,7 +448,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //重算的场景，先移除该场景对应的容量
         if (rebuild == 1) {
             if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType())){
-                scenePlusService.resetSpace(sceneNum);
+                try {
+                    scenePlusService.resetSpace(sceneNum);
+                }catch (Exception e){
+                    log.error("重置容量失败", e);
+                }
             }
         } else {
             //上传log-main.png
@@ -1248,7 +1252,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //重算的场景，先移除该场景对应的容量
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
         if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType())){
-            scenePlusService.resetSpace(num);
+            try {
+                scenePlusService.resetSpace(num);
+            }catch (Exception e){
+                log.error("重置容量失败", e);
+            }
         }
         String statusJsonOssPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "status.json";
         JSONObject statusJson = JSONObject.parseObject(fYunFileService.getFileContent(String.format(UploadFilePath.DATA_VIEW_PATH, num) + "status.json"));
@@ -1526,7 +1534,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         //重算的场景，先移除该场景对应的容量
         if (rebuild == 1) {
-            scenePlusService.resetSpace(sceneNum);
+            try {
+                scenePlusService.resetSpace(sceneNum);
+            }catch (Exception e){
+                log.error("重置容量失败", e);
+            }
             //删除oss的houst_floor.json(国际版可能会卡住)
             fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
         } else {