高密度e57

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

@@ -41,7 +41,7 @@ import java.util.Map;
 @Service
 @RefreshScope
 public class BuildE57SceneServiceImpl implements IBuildSceneService {
-    public static final String logUrlFormat = "**algorithm-log**: [%sbuild_log/%s/e57/console.log](%sbuild_log/%s/e57/console.log)";
+    public static final String logUrlFormat = "**algorithm-log**: [%sbuild_log/%s/e57/%s/console.log](%sbuild_log/%s/e57/%s/console.log)";
 
     @Value("${queue.modeling.e57.modeling-post}")
     private String queueModelingPost;
@@ -79,7 +79,7 @@ public class BuildE57SceneServiceImpl implements IBuildSceneService {
             ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
             ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
             String dataSource = scenePlusExt.getDataSource();
-            String path = dataSource + "_e57";
+            String path = dataSource + "_e57_" + message.getExt().get("splitType");
             message.setPath(dataSource);
 
             //根据相机类型，组装资源路径
@@ -134,12 +134,13 @@ public class BuildE57SceneServiceImpl implements IBuildSceneService {
         String path = message.getPath();
         String bucket = (String)message.getExt().get("bucket");
         String bizId = (String)message.getExt().get("bizId");
+        String splitType = (String)message.getExt().get("splitType");
         String ossKeyFormat = (String)message.getExt().get("ossKey");
         try {
             // 上传计算日志
             //如果是重复计算，没有走到计算逻辑，不需要上传日志文件
             log.info("开始上传计算日志");
-            String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, num) + "e57/";
+            String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, num) + "e57/" + splitType + "/";
             fYunFileService.uploadFile(path + File.separator + "console.log", buildLogPath + "console.log");
             log.info("计算日志上传完成");
             Map<String, Object> laserMqContent = new HashMap<>();
@@ -152,7 +153,7 @@ public class BuildE57SceneServiceImpl implements IBuildSceneService {
                 mqProducer.sendByWorkQueue(queueE57ModelingDone, laserMqContent);
 
                 // 发送钉钉消息，计算失败
-                String logUrl = String.format(logUrlFormat,fYunFileConfig.getHost(),num,fYunFileConfig.getHost(),num);
+                String logUrl = String.format(logUrlFormat,fYunFileConfig.getHost(),num,splitType, fYunFileConfig.getHost(),num, splitType);
                 buildSceneDTService.handModelFail("计算失败", message.getPath(), num, message.getHostName(), logUrl);
                 return;
             }