Ver código fonte

修改生成obj场景状态未修改的逻辑

tianboguang 2 anos atrás
pai
commit
193df09ad7

+ 6 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -129,6 +129,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
 
             boolean rewrite = false;
+            boolean reUpload = false;
             if (!ObjectUtils.isEmpty(modelType)) {
                 // 修改dataFdage文件
                 fdageJson.put("modelType", modelType);
@@ -140,11 +141,14 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 // 写入data.fdage 防止重算
                 fdageJson.remove("OnlyExportMeshObj");
                 rewrite = true;
+                reUpload = true;
             }
             if (rewrite) {
                 FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
-                String ossPath = getOssPath(message.getPath());
-                fYunFileService.uploadFile(message.getPath().concat("/capture/data.fdage"), ossPath + "data.fdage");
+                if(reUpload){
+                    String ossPath = getOssPath(message.getPath());
+                    fYunFileService.uploadFile(message.getPath().concat("/capture/data.fdage"), ossPath + "data.fdage");
+                }
             }
 
             message.getBuildContext().put("cameraType",message.getCameraType());

+ 6 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -107,6 +107,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
             this.downLoadSource(message, message.getPath());
             JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
             boolean rewrite = false;
+            boolean reUpload = false;
             if (!ObjectUtils.isEmpty(modelSceneKind)) {
                 // 修改dataFdage文件
                 fdageJson.put("modelType", modelSceneKind);
@@ -118,12 +119,15 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
                 // 写入data.fdage 防止重算
                 fdageJson.remove("OnlyExportMeshObj");
                 rewrite = true;
+                reUpload = true;
             }
 
             if (rewrite) {
                 FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
-                String ossPath = getOssPath(message.getPath());
-                fYunFileService.uploadFile(message.getPath().concat("/capture/data.fdage"), ossPath + "data.fdage");
+                if(reUpload){
+                    String ossPath = getOssPath(message.getPath());
+                    fYunFileService.uploadFile(message.getPath().concat("/capture/data.fdage"), ossPath + "data.fdage");
+                }
             }
 
             message.getBuildContext().put("cameraType",message.getCameraType());