diff --git a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf index 628397e3..c56a17a0 100644 Binary files a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf and b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf differ diff --git a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf index a928294b..d2e18c05 100644 Binary files a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf and b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 2efb06c4..7b80217b 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -831,23 +831,14 @@ public class CollectController extends Controller { if (type_id == 2) { String pdfPath = excelPath.replace(".xlsx", ".pdf"); AsposeUtil.xls2pdf(excelPath, pdfPath); - HttpServletResponse response = getResponse(); - BufferedInputStream br = new BufferedInputStream(new FileInputStream(pdfPath)); - byte[] buf = new byte[1024]; - int len; - response.reset(); // 非常重要 - URL u = new URL("file:///" + pdfPath); - response.setContentType(u.openConnection().getContentType()); - String fileName = pdf_filename; - response.setHeader("Content-Disposition", "inline; filename=" + fileName); - OutputStream out = response.getOutputStream(); - while ((len = br.read(buf)) > 0) out.write(buf, 0, len); - br.close(); - out.close(); + OutputStream outputStream = getResponse().getOutputStream(); + outputStream.write(CommonUtil.convertFileToByteArray(new File(pdfPath))); + outputStream.flush(); renderNull(); } } + /** * 功能:学校(单位)查看我该填报或者我已填报的任务列表 * diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java index eb778c19..d48c7256 100644 --- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java @@ -33,6 +33,17 @@ public class CommonUtil { public static String WebRoot; + public static byte[] convertFileToByteArray(File file) { + byte[] fileBytes = null; + try (FileInputStream fis = new FileInputStream(file)) { + fileBytes = new byte[(int) file.length()]; + fis.read(fileBytes); + } catch (IOException e) { + e.printStackTrace(); + } + return fileBytes; + } + //获取当前年份 public static String getCurrentYear() { SimpleDateFormat sdf = new SimpleDateFormat("yyyy");