111

src/main/java/com/fdkankan/contro/mq/service/impl/BuildReverseE57SceneServiceImpl.java

@@ -156,7 +156,6 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
 
             ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
 
-            Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
             Map<String, String> uploadFiles = this.getUploadFiles(scenePlus,path);
 
             scenePlus.setPayStatus(PayStatus.PAY.code());
@@ -195,16 +194,11 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
             JSONArray sweepLocations = visionObj.getJSONArray("sweepLocations");
             scenePlusExt.setShootCount(sweepLocations.size());
 
-            if (cameraType == 14) {
-                //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult4E57(path);
-                fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt);
-                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()) {
-                fdkkLaserService.cloudPointBuild(sceneCode,path);
-            }
+            fdkkLaserService.syncBuildResult4E57(path);
+            fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt);
+            sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
+                    .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
+            sceneEditControls.setShowMap(0);
 
 //            //删除计算目录
             if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
@@ -214,6 +208,7 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
 
             this.uploadStatusJson(scenePlus, scenePlusExt);
 
+            sceneEditControlsService.updateById(sceneEditControls);
             scenePlusService.updateById(scenePlus);
             scenePlusExtService.updateById(scenePlusExt);