将excel转化成流 小修改2

service/view/src/main/java/com/founder/view/controller/TbStLayerDataController.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -69,7 +70,7 @@ public class TbStLayerDataController {
             tbStLayer.setLrsj(new Date());
             tbStLayerService.save(tbStLayer);
             InputStream is = excelFile.getInputStream();
-            //InputStream is = new FileInputStream("C:\\Users\\JBB\\Desktop\\工作目录\\excel\\error (5).xlsx");
+            //InputStream is = new FileInputStream("C:\\Users\\JBB\\Desktop\\工作目录\\excel\\模板.xlsx");
             XSSFWorkbook sheets = new XSSFWorkbook(is);
             XSSFSheet sheetAt = sheets.getSheetAt(0);
             //获取excel有多少行
@@ -174,10 +175,10 @@ public class TbStLayerDataController {
                     pointList.add(errorData);
                 }
             }
-            if(pointList != null && pointList.size() > 0){
-                //输出流写入到excel中
             XSSFWorkbook wb = new XSSFWorkbook();
             XSSFSheet sheet = wb.createSheet();
+            if(pointList != null && pointList.size() > 0){
+                //输出流写入到excel中
                 //给个标题头
                 XSSFRow rowTitle = sheet.createRow(0);
                 rowTitle.createCell(0).setCellValue("X");
@@ -195,12 +196,11 @@ public class TbStLayerDataController {
                     rowData.createCell(2).setCellValue(title);
                     rowData.createCell(3).setCellValue(timeFormat);
                 }
+            }
             //通过输出流下载
-
-                //response.setContentType("application/vnd.ms-excel");
-                //response.setHeader("Content-Disposition", "attachment;filename=error.xlsx");
+            response.setContentType("application/vnd.ms-excel");
+            response.setHeader("Content-Disposition", "attachment;filename=error.xlsx");
             outputStream = response.getOutputStream();
-                System.out.println(outputStream);
             //设置文件响应输出格式
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             wb.write(os);
@@ -208,12 +208,10 @@ public class TbStLayerDataController {
             response.setContentType("application/msexcel;charset=utf-8");
             bytes = os.toByteArray();
             outputStream.write(bytes);
+            /*wb.write(outputStream);
+            wb.close();
             outputStream.flush();
-                outputStream.close();
-                //wb.close();
-                //return null;
-
-            }
+            outputStream.close();*/
             return MapRestResult.build(200,"数据上传成功！",bytes);
         } catch (Exception e) {
             e.printStackTrace();