Browse Source

Merge branch 'feature_v1.0' into develop

tags/V1.0.1
chengwang 1 year ago
parent
commit
6409253a6d
1 changed files with 9 additions and 4 deletions
  1. +9
    -4
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/ExportReportService.java

+ 9
- 4
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/ExportReportService.java View File

@@ -27,10 +27,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.*;
import java.net.URLEncoder;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -102,6 +100,13 @@ public class ExportReportService {

// 上传到oss
String ossUrl = this.uploadOss(filePath, filename);
//对下载地址进行一次URL编码操作
try {
ossUrl = URLEncoder.encode(ossUrl, "utf-8");
} catch (UnsupportedEncodingException e) {
log.info("对下载地址进行编码失败 ossUrl={}",ossUrl);
e.printStackTrace();
}

// 记录
this.insertAirDataExport(request, inspection, airDataType, ossUrl);

Loading…
Cancel
Save