lyhzzz 6 月之前
父节点
当前提交
e70d56a5c9

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

@@ -63,6 +63,7 @@ public class CaseDownService {
     public static String caseImg =      "/caseImg/getFfmpegImage?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";
 
 
@@ -256,6 +257,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){

+ 9 - 0
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);

+ 5 - 0
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
+    @Get("/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);