取消读取mnt目录的配置类

src/main/java/com/fdkankan/scene/config/FdkkLaserConfig.java

@@ -51,7 +51,10 @@ public class FdkkLaserConfig {
     public String defaultFolder;
 
 
-
+    /**
+     * 生成模型的路径
+     */
+    public String buildModelPath;
 
     @PostConstruct
     private void init() {

src/main/java/com/fdkankan/scene/constant/ConstantFileLocPath.java

@@ -0,0 +1,10 @@
+package com.fdkankan.scene.constant;
+
+/**
+ * @author Xiewj
+ * @date 2023/3/17
+ */
+public class ConstantFileLocPath {
+    public static final String SCENE_DATA_PATH_V4 = "/scene_v4/%s/data/";
+
+}

src/main/java/com/fdkankan/scene/oss/OssUtil.java

@@ -441,7 +441,9 @@ public class OssUtil {
     public String getFileContent(String pathKey) {
         return FileUtil.readUtf8String(FdkkLaserConfig.getProfile() + File.separator + pathKey);
     }
-
+    public String getFileContentloc(String pathKey) {
+        return FileUtil.readUtf8String(File.separator + pathKey);
+    }
     public List<String> listFiles(String pathKey) {
         return FileUtil.loopFiles(
                 FdkkLaserConfig.getProfile() + File.separator + pathKey).stream().map(file->{

src/main/java/com/fdkankan/scene/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -633,7 +633,7 @@ public class SceneDownloadHandlerServiceImpl {
         String fileName = key.substring(key.lastIndexOf("/") + 1);
 //        String url = this.resourceUrl + key.replace(fileName, URLEncoder.encode(fileName, "UTF-8")) + "?t=" + Calendar.getInstance().getTimeInMillis();
         if(key.contains("hot.json") || key.contains("link-scene.json")){
-            String content = ossUtil.getFileContent(key);
+            String content = ossUtil.getFileContentloc(key);
             if(StrUtil.isEmpty(content)){
                 return;
             }

src/main/java/com/fdkankan/scene/service/impl/SceneDownloadLogServiceImpl.java

@@ -94,7 +94,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
             }
             if(version == sceneDownloadLog.getSceneVersion()){
                 result.put("status", 2);
-                result.put("url",this.publicUrl+":"+serviceConfig.getServerPort()+ sceneDownloadLog.getDownloadUrl());
+                result.put("url",this.publicUrl+":"+serviceConfig.getServerPort()+"/profile" +sceneDownloadLog.getDownloadUrl());
                 return ResultData.ok(result);
             }else{
                 result.put("status", 3);
@@ -136,8 +136,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
                             .eq(SceneDownloadLog::getSceneNum,num)
                             .set(SceneDownloadLog::getDownloadUrl,downLoadProgressBean.getUrl())
             );
-
-            downLoadProgressBean.setUrl(this.publicUrl+":"+serviceConfig.getServerPort()+downLoadProgressBean.getUrl());
+            downLoadProgressBean.setUrl(this.publicUrl+":"+serviceConfig.getServerPort()+"/profile" +downLoadProgressBean.getUrl());
         }
         return ResultData.ok(downLoadProgressBean);
     }

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.*;
+import com.fdkankan.scene.constant.ConstantFileLocPath;
 import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneEditInfoMapper;
 import com.fdkankan.scene.oss.OssUtil;
@@ -223,7 +224,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         this.publicSurveillance(num, sceneEditInfoExt.getSurveillances(), bucket);
 
         //本地写sceneJson文件
-        String localSceneJsonPath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + "scene.json";
+        String localSceneJsonPath = String.format(scenePlusExt.getDataSource()+ ConstantFileLocPath.SCENE_DATA_PATH_V4, num) + "scene.json";
         FileUtils.writeFile(localSceneJsonPath, JSON.toJSONString(sceneJson));
         //上传sceneJson文件
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
@@ -526,7 +527,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         String bucket = scenePlusExt.getYunFileBucket();
         String editUserPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
-        String localDataPath = String.format(ConstantFilePath.SCENE_USER_PATH_V4, num);
+        String localDataPath = String.format(scenePlusExt.getDataSource()+ ConstantFileLocPath.SCENE_DATA_PATH_V4, num);
 
         JSONObject fileInfoJson = JSON.parseObject(param.getData());
         Float angel = null;
@@ -541,7 +542,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //处理户型图数据
         //上传floorplan_user.json文件
         FileUtils.writeFile(localDataPath + "floorplan_user.json", floorJsonData);
-        ossUtil.uploadFile(editUserPath + "floorplan_user.json", localDataPath + "floorplan.json", false);
+        ossUtil.uploadFile(editUserPath + "floorplan_user.json", localDataPath + "floorplan_user.json", false);
 
         //写入数据库
         Byte floorPlanUser = null;

src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -323,7 +323,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         if(StrUtil.isNotEmpty(scenePlusExt.getVideos())){
             sceneJson.setVideos(scenePlusExt.getVideos());
         }
-
+        sceneJson.setModelKind(scenePlusExt.getModelKind());
         //本地写sceneJson文件
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
         ossUtil.uploadFileBytes(sceneJsonPath, JSON.toJSONString(sceneJson).getBytes(StandardCharsets.UTF_8));