修改视频生成逻辑

src/main/java/com/fdkankan/contro/mq/listener/AbstrackBuildSceneListener.java

@@ -18,7 +18,7 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
         Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
         String correlationId = (String) correlation;
         String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        log.info("开始准备场景计算资源，队列名：{}，id：{},消息体:{}", msg, correlationId, msg);
+        log.info("开始准备场景计算资源，队列名：{}，id：{},消息体:{}", queueName, correlationId, msg);
         BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         buildSceneService.buildScenePre(buildSceneMessage);

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

@@ -636,14 +636,14 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         videosJson.put("data", jsonArray);
         if(Objects.nonNull(videoVersion) && videoVersion >= 4){
             videosJson.put("version", 3);
-            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/Up.xml");
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up.xml");
             if(cameraType == 13){
                 //转台相机
                 videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
             }
         }else {
             videosJson.put("version", 1);
-            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/Up2.xml");
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up2.xml");
             if(cameraType == 13){
                 //转台相机
                 videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
@@ -652,7 +652,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         if(cameraType == 5 || cameraType == 6){
             videosJson.put("version", 1);
-            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/stitch_params.txt");
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "stitch_params.txt");
         }
 
         return videosJson;