修改dam文件上传逻辑

pom.xml

@@ -46,6 +46,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>

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

@@ -2,6 +2,7 @@ package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -159,16 +160,18 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
 
             Map<String, String> newUploadFiles = this.uploadFileMapHandler(sceneCode, cameraType, uploadFiles);
 
-            // TODO: 2022/5/26 下载全景图采用打包本地文件的方式，这里应该是不需要上传到oss了，暂时保留代码并注释掉------start
-            //上传计算结果中的caches/images和caches/videos
-//            this.uploadCaches(sceneCode, uploadFiles, path);
-            // TODO: 2022/5/26 下载全景图采用打包本地文件的方式，这里应该是不需要上传到oss了，暂时保留代码并注释掉------end
-
             //上传全景图俯视图
             this.uploadFloorCad(path, sceneCode, newUploadFiles);
 
             //上传文件
             uploadToOssUtil.uploadMulFiles(newUploadFiles);
+
+            Map<String,String> damFileHeaders = new HashMap<>();
+            damFileHeaders.put("Content-Encoding","gzip");
+
+            // dam 文件设置请求头
+            newUploadFiles.entrySet().stream().filter(entry-> FileNameUtil.extName(entry.getKey()).equals(".dam"))
+                    .forEach(entry-> uploadToOssUtil.uploadOssWithHeaders(entry.getKey(),entry.getValue(),damFileHeaders));
             // TODO: 2022/3/11 同时上传一份到旧版本的目录，用于过渡期使用，待重构版本稳定后删除
             uploadToOssUtil.uploadMulFiles(uploadFiles);
 

src/test/java/ApplicationTests.java

@@ -0,0 +1,34 @@
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.fdkankan.contro.ModelingControlApplication;
+import com.fdkankan.fyun.oss.UploadToOssUtil;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+@SpringBootTest(classes = ModelingControlApplication.class)
+class ApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+    @Autowired
+    private UploadToOssUtil uploadToOssUtil;
+
+    @Test
+    public void test() throws Exception {
+        // gzip压缩
+//        FileUtil.appendUtf8String(new String(ZipUtil.gzip(new File("H:\\test\\dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam"))),"H:\\test\\results\\dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam");
+        FileUtil.writeBytes(ZipUtil.gzip(new File("H:\\test\\dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam")),"H:\\test\\results\\dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam");
+        Map<String,String> headers = new HashMap<>();
+        headers.put("Content-Encoding","gzip");
+        uploadToOssUtil.uploadOssWithHeaders("H:\\test\\results\\dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam","scene_view_data/KK-t-jIprLDNOZW/images/dacf7dfa24ae47fab8fcebfe4dc41ab9_50k.dam",headers);
+    }
+
+
+}