1

src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -19,5 +19,6 @@ public class FilePath {
     public final static String OFFLINE_RESOURCE_PACKAGE_PATH = OFFLINE_PACKAGE_PATH + "%s/www/package/resource/";
     public final static String OFFLINE_OSS_PATH = OFFLINE_PACKAGE_PATH + "%s/www";
     public final static String OFFLINE_LASER_OSS_PATH =  "/swss/%s/www/%s/";
-    public final static String LASER_OSS_PATH = "laser-prod/%s/data/%s/webcloud";
+    public final static String LASER_OSS_PATH = "datav1/%s/data/%s/webcloud";
+    public final static String LASER_OSS_PATH_TEST = "testdata/%s/data/%s/webcloud";
 }

src/main/java/com/fdkankan/fusion/common/util/UploadToOssUtil.java

@@ -319,7 +319,7 @@ public class UploadToOssUtil {
 		return null;
 	}
 
-	public FileInfoVo getFileInfo(String filePath){
+	public FileInfoVo getFileInfo(String filePath,String bucket){
 		if("local".equals(type)){
 			return localToOssUtil.getFileInfo(filePath);
 		}
@@ -343,7 +343,11 @@ public class UploadToOssUtil {
 		return null;
 	}
 
-	public Long getSize(String filePath){
+	public FileInfoVo getFileInfo(String filePath){
+		return getFileInfo(filePath,bucket);
+	}
+
+	public Long getSize(String filePath,String bucket){
 		if("local".equals(type)){
 			return localToOssUtil.getSize(filePath);
 		}
@@ -370,6 +374,11 @@ public class UploadToOssUtil {
 		return total;
 	}
 
+	public Long getSize(String filePath){
+		return getSize(filePath,bucket);
+	}
+
+
 	public String getOssPath(String path) {
 		return path.replace(queryPath,"");
 	}

src/main/java/com/fdkankan/fusion/controller/SceneController.java

@@ -5,6 +5,7 @@ import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.request.ScenePram;
@@ -86,10 +87,16 @@ public class SceneController extends BaseController{
             String sceneObjPath =null;
 
             if(type == 2 || type == 5){  //点云
-                sceneObjPath = String.format(FilePath.LASER_OSS_PATH, num,num)+"/cloud.js" ;
-                fileInfo = uploadToOssUtil.getFileInfo(sceneObjPath);
-                String scenePath = String.format(FilePath.LASER_OSS_PATH, num,num);
-                size = uploadToOssUtil.getSize(scenePath);
+                String scenePath = null;
+                if(CacheUtil.environment.contains("prod" )){
+                    sceneObjPath = String.format(FilePath.LASER_OSS_PATH, num,num)+"/cloud.js" ;
+                    scenePath = String.format(FilePath.LASER_OSS_PATH, num,num);
+                }else {
+                    sceneObjPath = String.format(FilePath.LASER_OSS_PATH_TEST, num,num)+"/cloud.js" ;
+                    scenePath = String.format(FilePath.LASER_OSS_PATH_TEST, num,num);
+                }
+                fileInfo = uploadToOssUtil.getFileInfo(sceneObjPath,"laser-data");
+                size = uploadToOssUtil.getSize(scenePath,"laser-data");
             }else {
                 sceneObjPath = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles/tileset.json";
                 if(!uploadToOssUtil.existKey(sceneObjPath)){