From 5dd0071775a7252ed22e4c6bfd1c3ee7daeb012a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 09:36:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/FileController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index 5dbea13..d7b9c83 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -1,15 +1,11 @@
package com.zy.common.web;
import com.alibaba.excel.EasyExcel;
-import com.zy.common.utils.excel.EnInitData;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
-import com.zy.common.utils.excel.ExcelUtils;
import com.core.common.R;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import com.zy.common.utils.excel.ExcelUtils;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
+import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -20,7 +16,7 @@
* todo
* Created by vincent on 2019-11-25
*/
-@Controller
+@RestController
@RequestMapping("excel/")
public class FileController {
@@ -30,7 +26,7 @@
@PostMapping("upload")
@ResponseBody
public R upload(MultipartFile file) throws IOException {
- EasyExcel.read(file.getInputStream(), EnInitData.class, new MatCodeExcelListener()).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
return R.ok();
}
@@ -45,7 +41,7 @@
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), EnInitData.class).sheet("妯℃澘").doWrite(ExcelUtils.data());
+ EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(ExcelUtils.data());
}
}
--
Gitblit v1.9.1