Prechádzať zdrojové kódy

Merge branch 'feature-slimming-nas-20230210-dsx' into test

dsx 2 rokov pred
rodič
commit
663289938d

+ 4 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -1226,9 +1227,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String ossReconstruction = ossResultPath + "caches/reconstruction/";
         if(!fYunFileService.fileExist(ossReconstruction + "final.bin")
                 || !fYunFileService.fileExist(ossReconstruction + "chunk.json")
-                || !fYunFileService.fileExist(ossResultPath + "caches/images")
-                || !fYunFileService.fileExist(ossResultPath + "caches/depthmap")
-                || !fYunFileService.fileExist(ossResultPath + "caches/depthmap_csc")
+                || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/images"))
+                || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/depthmap"))
+                || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/depthmap_csc"))
                 || !fYunFileService.fileExist(ossResultPath + "caches/panorama.json")
                 || !fYunFileService.fileExist(ossResultPath + "results/laserData/laser.ply")){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5038, SceneConstant.FAILURE_MSG_5038);