111

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

@@ -194,8 +194,8 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
             JSONArray sweepLocations = visionObj.getJSONArray("sweepLocations");
             scenePlusExt.setShootCount(sweepLocations.size());
 
-            fdkkLaserService.syncBuildResult4E57(path);
-            fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt);
+            String laserPath = fdkkLaserService.syncBuildResult4E57(path);
+            fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt, laserPath);
             sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
                     .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
             sceneEditControls.setShowMap(0);

src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -19,7 +19,7 @@ import java.util.Date;
 public interface IFdkkLaserService {
     void syncBuildResult(String sceneNum, String dataSource, Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus);
 
-    void syncBuildResult4E57(String dataSource);
+    String syncBuildResult4E57(String dataSource);
 
     void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, Integer buildObjStatus);
 
@@ -29,5 +29,5 @@ public interface IFdkkLaserService {
 
     void cloudPointBuild(String sceneCode, String visionEditFilePath);
 
-    void sendE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt);
+    void sendE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt, String path);
 }

src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

@@ -205,7 +205,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         rabbitMqProducer.sendByWorkQueue(cloudPointBuild, params);
     }
 
-    public void sendE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt) {
+    public void sendE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt, String path) {
         User user = userService.getById(scenePlus.getUserId());
         Map<String, Object> params = new HashMap<>();
         params.put("createTime", DateUtil.date2String(scenePlus.getCreateTime(), null));
@@ -219,6 +219,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("location", scenePlusExt.getLocation());
         params.put("payStatus", scenePlus.getPayStatus());
         params.put("shootCount", scenePlusExt.getShootCount());
+        params.put("path", path);
         if(scenePlus.getSceneStatus() == SceneStatus.wait.code()){
             rabbitMqProducer.sendByWorkQueue("laser-e57-init-scene", params);
         }
@@ -227,7 +228,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
     }
 
-    public void syncBuildResult4E57(String dataSource) {
+    public String syncBuildResult4E57(String dataSource) {
         log.info("激光转台相机构建结果 同步 请求 ");
         try {
             String jgPath = dataSource;
@@ -259,6 +260,8 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
             }
             FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
 
+            return jgPath + "/laserData";
+
         } catch (Exception e) {
             log.error("激光转台相机同步失败", e);
         }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -912,7 +912,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if("AZ".equals(otherType)){
             rabbitMqProducer.sendByWorkQueue("reverse-scene", params);
         }else{
-            fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt);
+            fdkkLaserService.sendE57ToLaser(scenePlus, scenePlusExt, null);
             rabbitMqProducer.sendByWorkQueue("reverseE57-modeling-pre", params);
         }