소스 검색

up.xml txt 相对路径去掉/oss/

dengsixing 9 달 전
부모
커밋
0e5652435b
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

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

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