ソースを参照

场景升级,增加迁移楼层户型图逻辑

dengsixing 3 年 前
コミット
b09620daa3

+ 4 - 2
src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -20,6 +20,7 @@ import com.fdkankan.repair.httpclient.FdkankanMiniClient;
 import com.fdkankan.repair.service.ISceneProService;
 import com.fdkankan.repair.service.ISceneResourceService;
 import com.fdkankan.repair.service.impl.SceneRepairService;
+import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -86,8 +87,9 @@ public class SceneRepairController {
         List<String> floorCadList = FileUtil.getFileList(floorCadPath);
         if(CollUtil.isNotEmpty(floorCadList)){
             floorCadList.stream().forEach(str->{
-                String[] arr = str.split("floor");
-                String[] arr2 = arr[1].split(".");
+                String substring = str.substring(str.lastIndexOf(File.separator) + 1);
+                String[] arr = substring.split("floor");
+                String[] arr2 = arr[1].split("\\.");
                 uploadToOssUtil.upload(str, String.format(userEditPath, num, arr2[0], arr2[1]));
                 uploadToOssUtil.upload(str, String.format(userViewPath, num, arr2[0], arr2[1]));
             });

+ 3 - 2
src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -352,8 +352,9 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             List<String> floorCadList = FileUtil.getFileList(floorCadPath);
             if(CollUtil.isNotEmpty(floorCadList)){
                 floorCadList.stream().forEach(str->{
-                    String[] arr = str.split("floor");
-                    String[] arr2 = arr[1].split(".");
+                    String substring = str.substring(str.lastIndexOf(File.separator) + 1);
+                    String[] arr = substring.split("floor");
+                    String[] arr2 = arr[1].split("\\.");
                     uploadToOssUtil.upload(str, String.format(userEditPath, num, arr2[0], arr2[1]));
                     uploadToOssUtil.upload(str, String.format(userViewPath, num, arr2[0], arr2[1]));
                 });