浏览代码

修改bug

houweiyu 5 年之前
父节点
当前提交
bed8e23628

+ 1 - 0
fdkanfang-common/src/main/java/com/fdkanfang/common/constant/ConstantFilePath.java

@@ -57,5 +57,6 @@ public class ConstantFilePath {
      * 场景码建议9位
      */
     public static final String OSS_IMAGE_PATH = "images/images";
+    public static final String OSS_FLOOR_PATH = "data/data";
 
 }

+ 5 - 0
fdkanfang-common/src/main/java/com/fdkanfang/common/util/ComputerUtil.java

@@ -94,6 +94,11 @@ public class ComputerUtil {
             if (fileJson.getIntValue("clazz") == 4) {
                 map.put(filePath, ossPanoPath + "pan/low/" + fileName.replace("low/", ""));
             }
+
+            //2k/4k照片目录
+            if (fileJson.getIntValue("clazz") == 5) {
+                map.put(filePath, ossPanoPath +  fileName);
+            }
         }
 
         CreateObjUtil.convertTxtToDam(panoRootPath + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", panoRootPath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");

+ 1 - 1
fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -653,7 +653,7 @@ public class HouseController extends BaseController {
             HashMap<String, String> uploadJson = new HashMap<>();
 
             // osspath : images/images+sceneCode/floor.json
-            uploadJson.put(sourcePath + "floorplan.json", ConstantFilePath.OSS_IMAGE_PATH+sceneCode+"/floor.json");
+            uploadJson.put(sourcePath + "floorplan.json", ConstantFilePath.OSS_FLOOR_PATH+sceneCode+"/floor.json");
             AliyunOssUtil.uploadMulFiles(uploadJson);
 
             // savePath:/data/kanfang/房源编号/