From 3c34085a21511610477f555cebf3f6fa42272402 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 07 十一月 2023 18:32:53 +0800
Subject: [PATCH] 产品结构导入数据
---
mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
index 67f390b..1cb0c7a 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
@@ -68,29 +68,9 @@
*/
@PostMapping("/uploadExt")
public R uploadExt(@RequestParam("file") MultipartFile file) {
- //ExcelReader excelReader = null;
- //try {
- // ExcelReaderBuilder excelReaderBuilder = EasyExcel.read(file.getInputStream());
- // excelReader = excelReaderBuilder.build();
- // List<ReadSheet> sheets = excelReader.excelExecutor().sheetList();
- // List<ReadSheet> readSheetList = new ArrayList<>();
- // for (ReadSheet sheet : sheets) {
- // ReadSheet readSheet = EasyExcel.readSheet(sheet.getSheetName()).registerReadListener(new StructureUploadExtListener(structureService)).build();
- // readSheetList.add(readSheet);
- // }
- // excelReader.read(readSheetList);
- //} catch (IOException e) {
- // e.printStackTrace();
- // return R.failed(e.getMessage());
- //} finally {
- // if (excelReader != null) {
- // // 杩欓噷鍗冧竾鍒繕璁板叧闂紝璇荤殑鏃跺�欎細鍒涘缓涓存椂鏂囦欢锛屽埌鏃剁鐩樹細宕╃殑
- // excelReader.finish();
- // }
- //}
ExcelReader excelReader = null;
try {
- excelReader = EasyExcel.read(file.getInputStream(), StructureData.class, new StructureUploadListener(structureService, dictUtils)).build();
+ excelReader = EasyExcel.read(file.getInputStream(), StructureData.class, new StructureUploadListener(structureService)).build();
ReadSheet readSheet = EasyExcel.readSheet(0).build();
ReadSheet readSheet2 = EasyExcel.readSheet(1).build();
excelReader.read(readSheet,readSheet2);
@@ -110,27 +90,27 @@
* 绔栫潃瀵煎叆
*
* @param file
- * @return
- */
- @PostMapping("/upload")
- public R simpleRead(@RequestParam("file") MultipartFile file) {
- ExcelReader excelReader = null;
- try {
- excelReader = EasyExcel.read(file.getInputStream(), StructureData.class, new StructureUploadListener(structureService, dictUtils)).build();
- ReadSheet readSheet = EasyExcel.readSheet(0).build();
- ReadSheet readSheet2 = EasyExcel.readSheet(1).build();
- excelReader.read(readSheet,readSheet2);
- } catch (IOException e) {
- e.printStackTrace();
- return R.failed(e.getMessage());
- } finally {
- if (excelReader != null) {
- // 杩欓噷鍗冧竾鍒繕璁板叧闂紝璇荤殑鏃跺�欎細鍒涘缓涓存椂鏂囦欢锛屽埌鏃剁鐩樹細宕╃殑
- excelReader.finish();
- }
- }
- return R.ok();
- }
+// * @return
+// */
+// @PostMapping("/upload")
+// public R simpleRead(@RequestParam("file") MultipartFile file) {
+// ExcelReader excelReader = null;
+// try {
+// excelReader = EasyExcel.read(file.getInputStream(), StructureData.class, new StructureUploadListener(structureService)).build();
+// ReadSheet readSheet = EasyExcel.readSheet(0).build();
+// ReadSheet readSheet2 = EasyExcel.readSheet(1).build();
+// excelReader.read(readSheet,readSheet2);
+// } catch (IOException e) {
+// e.printStackTrace();
+// return R.failed(e.getMessage());
+// } finally {
+// if (excelReader != null) {
+// // 杩欓噷鍗冧竾鍒繕璁板叧闂紝璇荤殑鏃跺�欎細鍒涘缓涓存椂鏂囦欢锛屽埌鏃剁鐩樹細宕╃殑
+// excelReader.finish();
+// }
+// }
+// return R.ok();
+// }
/**
* 鏍规嵁闆朵欢鍙锋煡璇㈤粯璁OM
--
Gitblit v1.9.3