|
|
@@ -1300,16 +1300,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
|
|
|
//重算的场景，先移除该场景对应的容量
|
|
|
- CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
|
|
|
- log.info("相机明细：{}", JSON.toJSONString(cameraDetail));
|
|
|
- log.info("激光场景配置:{}", JSON.toJSONString(laserCamTypeList));
|
|
|
- if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType())){
|
|
|
- try {
|
|
|
- scenePlusService.resetSpace(num);
|
|
|
- }catch (Exception e){
|
|
|
- log.error("重置容量失败", e);
|
|
|
- }
|
|
|
- }
|
|
|
+ scenePlusService.resetSpace(num);
|
|
|
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