From 0917be8757fa247e0b98c52e6d7ffc8abda1de64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 14:31:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java               |    6 +++---
 src/main/webapp/static/js/matCode/matCode.js                              |    1 +
 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java |   45 +++++++++++++++++++++++++++++++++++++--------
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 46b5c06..9dc1343 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -142,9 +142,9 @@
     @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
     @Transactional
     public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
-        Thread.sleep(2000);
-        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
-        return R.ok();
+        MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
+        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
+        return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
     }
 
     // 鎵撳嵃
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index e648b9d..c83f61c 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -2,13 +2,15 @@
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.fastjson.JSON;
 import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.service.MatCodeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -19,19 +21,28 @@
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MatCodeExcelListener.class);
 
+    private int total = 0;
+    private Long userId;
+
+    public MatCodeExcelListener() {
+    }
+
+    public MatCodeExcelListener(Long userId) {
+        this.userId = userId;
+    }
+
     /**
      * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
      */
-    private static final int BATCH_COUNT = 5;
+    private static final int BATCH_COUNT = 50;
 
-    private List<MatCodeExcel> list = new ArrayList<>();
+    private final List<MatCode> list = new ArrayList<>();
 
     /**
      * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
      */
     @Override
     public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
-        LOGGER.info("瑙ｆ瀽鍒颁竴鏉″ご鏁版嵁:{}", JSON.toJSONString(headMap));
     }
 
     /**
@@ -39,11 +50,25 @@
      */
     @Override
     public void invoke(MatCodeExcel data, AnalysisContext ctx) {
-        LOGGER.info("瑙ｆ瀽鍒颁竴鏉℃暟鎹�:{}", JSON.toJSONString(data));
-        list.add(data);
+        MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
+        if (matCodeService.selectById(data.getMatNo()) == null) {
+            MatCode matCode = new MatCode();
+            matCode.setMatNo(data.getMatNo());
+            matCode.setMatName(data.getMatName());
+            matCode.setBarcode(data.getBarcode());
+            matCode.setStr1(data.getStr1());
+            matCode.setModiTime(new Date());
+            matCode.setModiUser(this.userId);
+            matCode.setAppeTime(new Date());
+            matCode.setAppeUser(this.userId);
+            list.add(matCode);
+            total ++;
+        }
         // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
         if (list.size() >= BATCH_COUNT) {
-            MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
+            if (!matCodeService.insertBatch(list)) {
+                throw new CoolException("瀵煎叆鏁版嵁寮傚父");
+            }
             // 瀛樺偍瀹屾垚娓呯悊 list
             list.clear();
         }
@@ -55,6 +80,10 @@
      */
     @Override
     public void doAfterAllAnalysed(AnalysisContext ctx) {
-        LOGGER.info("鎵�鏈夋暟鎹В鏋愬畬鎴愶紒");
+        LOGGER.info("鏂板{}鏉＄墿鏂欎俊鎭紒", total);
+    }
+
+    public int getTotal() {
+        return total;
     }
 }
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 0483179..9dfe277 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -258,6 +258,7 @@
             $('#fileMame').html("");
             layer.closeAll('loading');
             layer.msg(res.msg);
+            tableReload(false);
         }
         , error: function(index, upload){
             layer.closeAll('loading');

--
Gitblit v1.9.1