From a1547b55b98257f84fba107a7abd7c39c75b2eea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 10:53:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eb80c17..9ddee06 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -101,18 +101,11 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth
- public void export(@RequestBody JSONObject param, HttpServletResponse response) throws Exception{
-// List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-// EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
-// Map<String, Object> map = excludeTrash(param.getJSONObject("matCode"));
-// convert(map, wrapper);
-// List<MatCode> list = matCodeService.selectList(wrapper);
-
-
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ public void export(@RequestParam(required = false) String fileName,
+ @RequestParam(required = false) Integer rowCount,
+ HttpServletResponse response) throws Exception {
List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
-
-
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
MatCodeExcel excel = new MatCodeExcel();
@@ -122,17 +115,20 @@
excel.setStr1(matCode.getStr1());
excel.setStr2(matCode.getStr2());
excels.add(excel);
+ if (rowCount != null && excels.size() >= rowCount){
+ break;
+ }
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
+ fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
+ EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("琛�1").doWrite(excels);
}
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
Thread.sleep(2000);
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
--
Gitblit v1.9.1