|
@@ -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())){
|