Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -29,10 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
 
@@ -831,23 +828,18 @@ 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));
+             * 解决java.io.IOException: UT010029: Stream is closed报错
-            byte[] buf = new byte[1024];
+             * 由于HttpServlet的request和response里的流都只能读写一次，关掉就没有了, 所以不能使用该方法
-            int len;
+             */
-            response.reset(); // 非常重要
+            OutputStream outputStream = getResponse().getOutputStream();
-            URL u = new URL("file:///" + pdfPath);
+            outputStream.write(FileUtil.readBytes(pdfPath));
-            response.setContentType(u.openConnection().getContentType());
+            outputStream.flush();
-            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();
             renderNull();
         }
     }
 
+
     /**
      * 功能：学校（单位）查看我该填报或者我已填报的任务列表
      *

src/main/java/com/dsideal/QingLong/Util/CommonUtil.java

@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;