Ver código fonte

Merge branch 'release-4.14.4' into test

dengsixing 1 semana atrás
pai
commit
962cf6b54a

+ 4 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -982,6 +982,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 for (Object lod : lods) {
                     JSONObject lodObj = (JSONObject) lod;
                     String objPath = lodObj.getString("objPath");
+                    if(objPath.contains("lod_") && !objPath.contains("lod_0")){
+                        continue;
+                    }
                     if(StrUtil.isEmpty(objPath) || !FileUtil.exist(path + objPath)){
                         throw new BusinessException(ErrorCode.FAILURE_CODE_5070);
                     }
@@ -1299,7 +1302,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<String> keys = fYunFileService.listRemoteFiles(bucket, meshOssPath);
         //下载
         keys.stream().filter(v->{
-            if(v.contains("/mesh/floor_") && !v.contains("lod_0")){
+            if(v.contains("lod_") && !v.contains("lod_0")){
                 return false;
             }
             return true;