|
|
@@ -1254,8 +1254,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
if(Objects.nonNull(scenePlus)){
|
|
|
scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
laseCallTime = scenePlusExt.getAlgorithmTime();
|
|
|
+ cameraId = scenePlus.getCameraId();
|
|
|
}else{
|
|
|
laseCallTime = scenePro.getCreateTime();
|
|
|
+ cameraId = scenePro.getCameraId();
|
|
|
}
|
|
|
|
|
|
// //查询场景是否处于冻结状态，如果已冻结，不允许重算
|
|
|
@@ -1300,7 +1302,14 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
|
|
|
//重算的场景，先移除该场景对应的容量
|
|
|
- scenePlusService.resetSpace(num);
|
|
|
+ CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
|
|
|
+ if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType())){
|
|
|
+ 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"));
|
|
|
if(ObjectUtils.isEmpty(statusJson)){
|
dengsixing