1

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -68,6 +68,7 @@ public class CaseDownService {
     public static String getMapConfig =      "/notAuth/getMapConfig";
 
     public static String laserData = "/laser/dataset/%s/getDataSet";
+    public static String laserDataSetAndControlPoint = "/laser/4dage/%s/getDataSetAndControlPoint";
     public static String laserDataQuery = "/laser/filter/%s/query?datasetId=%s";
 
 
@@ -255,6 +256,16 @@ public class CaseDownService {
 
         List<SceneVo> sceneVos = caseService.sceneList(param);
         for (SceneVo sceneData : sceneVos) {
+            if(StringUtils.isNotBlank(sceneData.getCutModelPath())){
+                sceneData.setCutModelPath(sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            }
+            if(StringUtils.isNotBlank(sceneData.getSurveillancePath())){
+                sceneData.setCutModelPath(sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            }
+            if(StringUtils.isNotBlank(sceneData.getSceneJsonPath())){
+                sceneData.setCutModelPath(sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            }
+
             //下载模型
             if(StringUtils.isNotBlank(sceneData.getModelGlbUrl())){
                 downModel(caseId,sceneData.getModelGlbUrl());
@@ -288,6 +299,10 @@ public class CaseDownService {
                     }
 
                 }
+                FdkkResponse dataSetAndControlPoint = laserService.getDataSetAndControlPoint(sceneData.getNum());
+                if(dataSetAndControlPoint !=null){
+                    jsonObject.put(String.format(laserDataSetAndControlPoint,sceneData.getNum()),dataSetAndControlPoint);
+                }
 
             }
             if(sceneData.getModelId() != null){

src/main/java/com/fdkankan/fusion/httpClient/LaserService.java

@@ -74,6 +74,15 @@ public class LaserService {
         }
         return  null;
     }
+    public FdkkResponse getDataSetAndControlPoint(String num) {
+        try {
+           return laserClient.getDataSetAndControlPoint(num);
+
+        }catch (Exception e){
+            log.info("获取激光场景信息失败getSceneInfo-error：{}",num,e);
+        }
+        return  null;
+    }
     public FdkkResponse getSceneInfoQuery(String num,String id) {
         try {
            return laserClient.getSceneInfoQuery(num,id);

src/main/java/com/fdkankan/fusion/httpClient/client/LaserClient.java

@@ -48,9 +48,14 @@ public interface LaserClient {
     FdkkResponse downOfflineSceneStatus(@JSONBody SSDownSceneParam param) ;
 
 
+    //https://uat-laser.4dkankan.com/laser/dataset/SS-t-j3nYkCDuZEN/getDataSet
     @Get("/laser/dataset/{num}/getDataSet")
     FdkkResponse getSceneInfo(@Var("num")String num);
 
+    //https://test-mix3d.4dkankan.com/laser/4dage/SS-t-j3nYkCDuZEN/getDataSetAndControlPoint
+    @Post("/laser/4dage/{num}/getDataSetAndControlPoint")
+    FdkkResponse getDataSetAndControlPoint(@Var("num")String num);
+
     @Get("/laser/filter/{num}/query")
     FdkkResponse getSceneInfoQuery(@Var("num")String num,@Query("datasetId") String datasetId);
 

src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -57,21 +57,21 @@ public class SceneVo extends Model {
 
 
     public String getCutModelPath() {
-        if(StringUtils.isNotBlank(num)){
+        if(StringUtils.isNotBlank(num) && StringUtils.isBlank(cutModelPath)){
             return "/oss/"+String.format(FilePath.OBJ_OSS_PATH,num)+"/user/cutModel.json";
         }
         return cutModelPath;
     }
 
     public String getSurveillancePath() {
-        if(StringUtils.isNotBlank(num)){
+        if(StringUtils.isNotBlank(num)&& StringUtils.isBlank(surveillancePath)){
             return "/oss/"+String.format(FilePath.OBJ_OSS_PATH,num)+"/user/surveillance.json";
         }
         return surveillancePath;
     }
 
     public String getSceneJsonPath() {
-        if(StringUtils.isNotBlank(num)){
+        if(StringUtils.isNotBlank(num)&& StringUtils.isBlank(sceneJsonPath)){
             return "/oss/"+String.format(FilePath.OBJ_OSS_PATH,num)+"/data/scene.json";
         }
         return sceneJsonPath;