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/asrs/controller/MatCodeController.java |   37 ++++++++++++++----
 src/main/java/com/zy/common/utils/excel/ExcelUtils.java     |   44 ++++++++++++++++++++++
 src/main/webapp/static/js/matCode/matCode.js                |   18 ++++----
 src/main/java/com/zy/common/web/FileController.java         |   18 +++-----
 4 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index a2c24a4..eb80c17 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -13,14 +13,16 @@
 import com.core.common.R;
 import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.service.MatCodeService;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
+import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.*;
 
 @RestController
@@ -100,13 +102,32 @@
     // 瀵煎嚭
     @RequestMapping(value = "/matCode/export/auth")
     @ManagerAuth
-    public R export(@RequestBody JSONObject param){
-        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);
-        return R.ok(exportSupport(list, fields));
+    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);
+
+
+        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+
+
+        List<MatCodeExcel> excels = new ArrayList<>();
+        for (MatCode matCode : list) {
+            MatCodeExcel excel = new MatCodeExcel();
+            excel.setMatNo(matCode.getMatNo());
+            excel.setBarcode(matCode.getBarcode());
+            excel.setMatName(matCode.getMatName());
+            excel.setStr1(matCode.getStr1());
+            excel.setStr2(matCode.getStr2());
+            excels.add(excel);
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
     }
 
     // 瀵煎叆
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
new file mode 100644
index 0000000..d51ec8e
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
@@ -0,0 +1,44 @@
+package com.zy.common.utils.excel;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
+import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2019-11-24
+ */
+public class ExcelUtils {
+
+    public static void main(String[] args) {
+//        new ExcelUtils().simpleRead();
+        new ExcelUtils().simpleWrite();
+    }
+
+    public void simpleRead(){
+        ExcelReaderBuilder read = EasyExcel.read("/Users/vincent/Desktop/3869.xls", MatCodeExcel.class, new MatCodeExcelListener());
+        // 璇诲彇绗竴涓猻heet(琛�),鏂囦欢娴佷細鑷姩鍏抽棴
+        read.sheet().doRead();
+    }
+
+    public void simpleWrite(){
+        EasyExcel.write("/Users/vincent/Desktop/writeDemo.xls", MatCodeExcel.class).sheet("lxt").doWrite(data());
+    }
+
+    public static List<MatCodeExcel> data(){
+        List<MatCodeExcel> list = new ArrayList<>();
+        for (int i = 0; i<1000; i++) {
+            MatCodeExcel data = new MatCodeExcel();
+            data.setMatNo("1");
+            data.setBarcode("2");
+            data.setMatName("3");
+            data.setStr1("5");
+            data.setStr2("6");
+            list.add(data);
+        }
+        return list;
+    }
+}
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());
     }
 
 }
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 1aa6c3f..2e6971b 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -192,18 +192,18 @@
                         url: baseUrl+"/matCode/export/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
-                        dataType:'json',
+                        // dataType:'json',
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
-                            layer.closeAll();
-                            if (res.code === 200) {
-                                table.exportFile(titles,res.data,'xls');
-                            } else if (res.code === 403) {
-                                top.location.href = baseUrl;
-                            } else {
-                                layer.msg(res.msg)
-                            }
+                            // layer.closeAll();
+                            // if (res.code === 200) {
+                            //     table.exportFile(titles,res.data,'xls');
+                            // } else if (res.code === 403) {
+                            //     top.location.href = baseUrl;
+                            // } else {
+                            //     layer.msg(res.msg)
+                            // }
                         }
                     });
                 });

--
Gitblit v1.9.1