|
@@ -72,12 +72,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
@Value("${queue.modeling.single.modeling-call}")
|
|
@Value("${queue.modeling.single.modeling-call}")
|
|
private String singleModelingCall;
|
|
private String singleModelingCall;
|
|
|
|
|
|
- @Value("${queue.modeling.modeling-pre}")
|
|
|
|
- private String queueModelingPre;
|
|
|
|
-
|
|
|
|
- @Value("${queue.modeling.modeling-post}")
|
|
|
|
- private String queueModelingPost;
|
|
|
|
-
|
|
|
|
@Value("${model.type:#{null}}")
|
|
@Value("${model.type:#{null}}")
|
|
private String modelType;
|
|
private String modelType;
|
|
|
|
|
|
@@ -126,8 +120,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
private ICompanyService companyService;
|
|
private ICompanyService companyService;
|
|
@Autowired
|
|
@Autowired
|
|
private ISceneAsynOperLogService sceneAsynOperLogService;
|
|
private ISceneAsynOperLogService sceneAsynOperLogService;
|
|
- @Autowired
|
|
|
|
- private ISceneBuildProcessLogService sceneBuildProcessLogService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void buildScenePre(BuildSceneCallMessage message) throws Exception{
|
|
public void buildScenePre(BuildSceneCallMessage message) throws Exception{
|
|
@@ -317,6 +309,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
|
|
sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
|
|
.eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
|
|
.eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
|
|
sceneEditControls.setShowMap(0);
|
|
sceneEditControls.setShowMap(0);
|
|
|
|
+ } else if (new File(path + "/results/laserData/vision_edit.txt").exists()) {
|
|
|
|
+ // 上传点云编辑文件,并通知激光系统
|
|
|
|
+ String visionEditFilePath = fYunFileService.uploadFile(path + "/results/laserData/vision_edit.txt", String.format(UploadFilePath.DATA_EDIT_PATH, sceneCode) + "vision_edit.txt");
|
|
|
|
+ fdkkLaserService.cloudPointBuild(sceneCode,visionEditFilePath);
|
|
}
|
|
}
|
|
|
|
|
|
//写scene.json
|
|
//写scene.json
|