download report

src/main/java/com/reyun/controller/manage/ExportReportInfoController.java

@@ -12,6 +12,7 @@ import com.reyun.security.annotation.CurrentAccount;
 import com.reyun.service.AppService;
 import com.reyun.service.ExportReportInfoService;
 import com.reyun.service.UserLogService;
+import com.reyun.util.AwsS3Util;
 import com.reyun.util.Constant;
 import com.reyun.util.ResultModel;
 import com.reyun.util.ResultStatus;
@@ -175,7 +176,7 @@ public class ExportReportInfoController {
     public void getDownloadResponseEntity(HttpServletRequest request, HttpServletResponse response, @PathVariable("app") Long app, @PathVariable Long id,
                                           @CurrentAccount Account loginAccount) throws IOException {
 
-        /*ExportReportInfo info = exportService.findOne(id);
+        ExportReportInfo info = exportService.findOne(id);
 
         userLogService.insertLog(loginAccount, LogEnumType.DOWNLOAD.getCode(),
                 LogEnumType.DOWNLOAD.getName() + "报表下载 ", info,app, OperateObjectEnumType.REPORTDOWN.getCode(), request);
@@ -206,8 +207,7 @@ public class ExportReportInfoController {
 
         try {
 
-            URL url = new URL(Constant.S3_ROOTDIR + "/reportdownload/" + URLEncoder.encode(info.getFileName(), StandardCharsets.UTF_8.toString()));
-            in = url.openStream();
+            in = AwsS3Util.getInstance().downloadStreamFromS3(Constant.bucket, "trackingio/reportdownload/" + info.getFileName());
             content = IOUtils.toString(in);
 
             if (content.contains("\t")) {
@@ -227,7 +227,7 @@ public class ExportReportInfoController {
         }
 
         //更新下载人和IP
-        exportService.updateDownloadInfo(info.getId(), loginAccount, downloadIP);*/
+        exportService.updateDownloadInfo(info.getId(), loginAccount, downloadIP);
     }
 
     @RequestMapping(value = "checkexist/{id}", method = RequestMethod.GET)