Przeglądaj źródła

修改obj场景生成逻辑

tianboguang 2 lat temu
rodzic
commit
163b5bac2c

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

@@ -152,8 +152,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             Thread.sleep(60000);
         }
 
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", "images/images" + projectNum + "/" + ConstantFileName.modelUUID + "_50k.dam.lzma");
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", "images/images" + projectNum + "/" + ConstantFileName.modelUUID + "_50k.dam");
+        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k.dam.lzma");
+        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k.dam");
 
         String texPath = laserObjFilePath + File.separator + "results" + File.separator + "tex";
 
@@ -161,14 +161,14 @@ public class BuildObjServiceImpl implements IBuildSceneService {
         if(texFile.exists()){
             for (File textureFile : texFile.listFiles()) {
                 if(textureFile.getName().endsWith(".jpg")){
-                    fYunFileService.uploadFile(textureFile.getAbsolutePath(), "images/images" +
-                            projectNum + "/" + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/"+textureFile.getName());
+                    fYunFileService.uploadFile(textureFile.getAbsolutePath(),
+                            String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/"+textureFile.getName());
                 }
             }
         }
 
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + "tex/texture1.jpg", "images/images" +
-                projectNum + "/" + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/texture1.jpg");
+        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + "tex/texture1.jpg",
+                String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + "/" + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/texture1.jpg");
 
         // 拷贝结果
         log.info("开始拷贝obj文件");