From 4b470f270f171a269f3bc9d4e10522b0e66ed826 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 14:38:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 6 +++---
src/main/java/com/zy/common/utils/excel/ExcelUtils.java | 1 -
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 12 ------------
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java | 11 ++++++-----
src/main/java/com/zy/common/web/FileController.java | 1 -
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 9dc1343..f8f1bdf 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -22,7 +22,6 @@
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +55,9 @@
EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -121,7 +123,6 @@
excel.setBarcode(matCode.getBarcode());
excel.setMatName(matCode.getMatName());
excel.setStr1(matCode.getStr1());
- excel.setStr2(matCode.getStr2());
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
@@ -140,7 +141,6 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
@ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
- @Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
index 61cc2a7..561cb39 100644
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
@@ -34,7 +34,6 @@
data.setBarcode("80001854");
data.setMatName("閾濆甫|1100-O|0.33*475|");
data.setStr1("701010015907");
- data.setStr2("榧庤儨閾濅笟棣欐腐_椹潵瑗夸簹UPT");
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
index b7f2150..4e33277 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -31,11 +31,6 @@
@ExcelProperty(value = "鐗╂枡鍗曚綅", index = 3)
private String str1;
- /**
- * 鐗╂枡瑙勬牸
- */
- @ExcelProperty(value = "鐗╂枡瑙勬牸", index = 4)
- private String str2;
public String getMatNo() {
return matNo;
@@ -69,11 +64,4 @@
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/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index c83f61c..4ef5683 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
@@ -63,15 +63,16 @@
matCode.setAppeUser(this.userId);
list.add(matCode);
total ++;
- }
- // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
- if (list.size() >= BATCH_COUNT) {
if (!matCodeService.insertBatch(list)) {
throw new CoolException("瀵煎叆鏁版嵁寮傚父");
}
- // 瀛樺偍瀹屾垚娓呯悊 list
- list.clear();
}
+ // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
+// if (list.size() >= BATCH_COUNT) {
+//
+// // 瀛樺偍瀹屾垚娓呯悊 list
+// list.clear();
+// }
}
/**
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index a0bc022..3074912 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -51,7 +51,6 @@
excel.setBarcode(matCode.getBarcode());
excel.setMatName(matCode.getMatName());
excel.setStr1(matCode.getStr1());
- excel.setStr2(matCode.getStr2());
excels.add(excel);
}
// 杩欓噷娉ㄦ剰 鏈夊悓瀛﹀弽搴斾娇鐢╯wagger 浼氬鑷村悇绉嶉棶棰橈紝璇风洿鎺ョ敤娴忚鍣ㄦ垨鑰呯敤postman
--
Gitblit v1.9.1