From 1185b9fa3a42b47116403c581b892ec54503a778 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 08:46:58 +0800
Subject: [PATCH] #
---
/dev/null | 41 -------------
src/main/java/com/zy/asrs/controller/MatCodeController.java | 6 +-
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 79 ++++++++++++++++++++++++++
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java | 10 +-
src/main/java/com/zy/common/web/FileController.java | 4
5 files changed, 89 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 97bcf76..a2c24a4 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -13,8 +13,8 @@
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
-import com.zy.common.utils.excel.EnInitData;
-import com.zy.common.utils.excel.EnInitDataListener;
+import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -114,7 +114,7 @@
@ManagerAuth
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
Thread.sleep(2000);
-// EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
return R.ok();
}
diff --git a/src/main/java/com/zy/common/utils/excel/EnInitData.java b/src/main/java/com/zy/common/utils/excel/EnInitData.java
deleted file mode 100644
index e352810..0000000
--- a/src/main/java/com/zy/common/utils/excel/EnInitData.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zy.common.utils.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * ExcelProperty涓殑value鍜宨ndex鍙鏈変竴涓涓婂氨鑳借В鏋�
- * Created by vincent on 2019-11-25
- */
-public class EnInitData {
-
- @ExcelProperty(value = "浼佷笟鍚嶇О", index = 0)
- private String enName;
-
- @ExcelProperty(value = "缁熶竴绀句細淇＄敤浠ｇ爜", index = 1)
- private String code;
-
- @ExcelProperty(value = "涓荤绋庡姟鏈哄叧", index = 7)
- private String office;
-
- @ExcelProperty(value = "璐熻矗浜虹數璇�", index = 10)
- private String mobile;
-
- public String getEnName() {
- return enName;
- }
-
- public void setEnName(String enName) {
- this.enName = enName;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getOffice() {
- return office;
- }
-
- public void setOffice(String office) {
- this.office = office;
- }
-
- public String getMobile() {
- return mobile;
- }
-
- public void setMobile(String mobile) {
- this.mobile = mobile;
- }
-}
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
deleted file mode 100644
index 0532402..0000000
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zy.common.utils.excel;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-
-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", EnInitData.class, new EnInitDataListener());
- // 璇诲彇绗竴涓猻heet(琛�),鏂囦欢娴佷細鑷姩鍏抽棴
- read.sheet().doRead();
- }
-
- public void simpleWrite(){
- EasyExcel.write("/Users/vincent/Desktop/writeDemo.xls", EnInitData.class).sheet("lxt").doWrite(data());
- }
-
- public static List<EnInitData> data(){
- List<EnInitData> list = new ArrayList<>();
- for (int i = 0; i<1000; i++) {
- EnInitData data = new EnInitData();
- data.setEnName("娴嬭瘯");
- data.setCode("test");
- data.setOffice("鍥藉绋庡姟鎬诲眬鏉窞甯備綑鏉尯绋庡姟灞�浣欐澀绋庡姟鎵�");
- data.setMobile("15988786205");
- list.add(data);
- }
- return list;
- }
-}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
new file mode 100644
index 0000000..b7f2150
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -0,0 +1,79 @@
+package com.zy.common.utils.excel.matcode;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * Created by vincent on 2020/6/6
+ */
+public class MatCodeExcel {
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ExcelProperty(value = "鐗╂枡缂栫爜", index = 0)
+ private String matNo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ExcelProperty(value = "鏉＄爜", index = 1)
+ private String barcode;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ExcelProperty(value = "鐗╂枡鍚嶇О", index = 2)
+ private String matName;
+
+ /**
+ * 鐗╂枡鍗曚綅
+ */
+ @ExcelProperty(value = "鐗╂枡鍗曚綅", index = 3)
+ private String str1;
+
+ /**
+ * 鐗╂枡瑙勬牸
+ */
+ @ExcelProperty(value = "鐗╂枡瑙勬牸", index = 4)
+ private String str2;
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public String getBarcode() {
+ return barcode;
+ }
+
+ public void setBarcode(String barcode) {
+ this.barcode = barcode;
+ }
+
+ public String getMatName() {
+ return matName;
+ }
+
+ public void setMatName(String matName) {
+ this.matName = matName;
+ }
+
+ public String getStr1() {
+ return str1;
+ }
+
+ public void setStr1(String str1) {
+ this.str1 = str1;
+ }
+
+ public String getStr2() {
+ return str2;
+ }
+
+ public void setStr2(String str2) {
+ this.str2 = str2;
+ }
+}
diff --git a/src/main/java/com/zy/common/utils/excel/EnInitDataListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
similarity index 83%
rename from src/main/java/com/zy/common/utils/excel/EnInitDataListener.java
rename to src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index 2a54e8f..eedcde1 100644
--- a/src/main/java/com/zy/common/utils/excel/EnInitDataListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils.excel;
+package com.zy.common.utils.excel.matcode;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
@@ -13,16 +13,16 @@
/**
* Created by vincent on 2019-11-25
*/
-public class EnInitDataListener extends AnalysisEventListener<EnInitData> {
+public class MatCodeExcelListener extends AnalysisEventListener<MatCodeExcel> {
- private static final Logger LOGGER = LoggerFactory.getLogger(EnInitDataListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MatCodeExcelListener.class);
/**
* 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
*/
private static final int BATCH_COUNT = 5;
- private List<EnInitData> list = new ArrayList<>();
+ private List<MatCodeExcel> list = new ArrayList<>();
/**
* 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
@@ -36,7 +36,7 @@
* 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
*/
@Override
- public void invoke(EnInitData data, AnalysisContext ctx) {
+ public void invoke(MatCodeExcel data, AnalysisContext ctx) {
LOGGER.info("瑙ｆ瀽鍒颁竴鏉℃暟鎹�:{}", JSON.toJSONString(data));
list.add(data);
// 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index d316a71..5dbea13 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -2,7 +2,7 @@
import com.alibaba.excel.EasyExcel;
import com.zy.common.utils.excel.EnInitData;
-import com.zy.common.utils.excel.EnInitDataListener;
+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;
@@ -30,7 +30,7 @@
@PostMapping("upload")
@ResponseBody
public R upload(MultipartFile file) throws IOException {
- EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), EnInitData.class, new MatCodeExcelListener()).sheet().doRead();
return R.ok();
}
--
Gitblit v1.9.1