Browse Source

添加点云校准逻辑

tianboguang 2 năm trước cách đây
mục cha
commit
3d6f912dff

+ 4 - 8
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -72,12 +72,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("${queue.modeling.single.modeling-call}")
     private String singleModelingCall;
 
-    @Value("${queue.modeling.modeling-pre}")
-    private String queueModelingPre;
-
-    @Value("${queue.modeling.modeling-post}")
-    private String queueModelingPost;
-
     @Value("${model.type:#{null}}")
     private String modelType;
 
@@ -126,8 +120,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ICompanyService companyService;
     @Autowired
     private ISceneAsynOperLogService sceneAsynOperLogService;
-    @Autowired
-    private ISceneBuildProcessLogService sceneBuildProcessLogService;
 
     @Override
     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)
                         .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
                 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

+ 2 - 0
src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -23,4 +23,6 @@ public interface IFdkkLaserService {
     void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String userName, boolean b);
 
     void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild);
+
+    void cloudPointBuild(String sceneCode, String visionEditFilePath);
 }

+ 12 - 0
src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,6 +41,9 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     @Value("${queue.application.laser.update-build-status}")
     private String updateBuildStatus;
 
+    @Value("${queue.application.laser.cloud-point-build}")
+    private String cloudPointBuild;
+
 
     public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime) {
         Map<String, Object> params = new HashMap<>();
@@ -149,4 +153,12 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         return version;
     }
 
+    @Override
+    public void cloudPointBuild(String sceneCode, String visionEditFilePath) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("sceneNum", sceneCode);
+        params.put("filePaths", Arrays.asList(visionEditFilePath));
+        params.put("businessType", 0);
+        rabbitMqProducer.sendByWorkQueue(cloudPointBuild, params);
+    }
 }