lyhzzz 2 mesi fa
parent
commit
caf7541878

+ 8 - 0
src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -73,6 +73,7 @@ public class CaseDownService {
     public static String casePathInfoUrl =      "/casePath/info?caseId=";
 
     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";
 
 
@@ -276,6 +277,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){
@@ -470,6 +475,9 @@ public class CaseDownService {
                 laserService.rebuildOffline(offPath,isLaser,sceneId);
                 return true;
             }
+            if(!offlineFolder.contains(num)){
+                offlineFolder  += File.separator + num;
+            }
             File file = new File(offlineFolder);
             File file1 = new File(offPath + File.separator + num);
             if(!file.getPath().equals(file1.getPath()) || file1.getParentFile().getPath().equals(file.getPath())){

+ 10 - 0
src/main/java/com/fdkankan/fusion/httpClient/LaserService.java

@@ -107,4 +107,14 @@ public class LaserService {
             log.info("获取激光场景信息失败rebuildOffline-error:{},{},{}",buildPath,isLaser,id,e);
         }
     }
+
+    public FdkkResponse getDataSetAndControlPoint(String num) {
+        try {
+            return laserClient.getDataSetAndControlPoint(num);
+
+        }catch (Exception e){
+            log.info("获取激光场景信息失败getSceneInfo-error:{}",num,e);
+        }
+        return  null;
+    }
 }

+ 4 - 0
src/main/java/com/fdkankan/fusion/httpClient/client/LaserClient.java

@@ -52,6 +52,10 @@ public interface LaserClient {
     @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);