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 | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 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 081b37e..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
@@ -19,14 +19,14 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.util.DictUtils;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
-import com.chinaztt.mes.technology.excel.*;
import com.chinaztt.mes.technology.dto.StructureDTO;
import com.chinaztt.mes.technology.entity.StructureComponent;
+import com.chinaztt.mes.technology.excel.StructureData;
+import com.chinaztt.mes.technology.excel.StructureUploadListener;
import com.chinaztt.mes.technology.service.StructureService;
import com.chinaztt.ztt.admin.api.entity.SysDictItem;
import com.chinaztt.ztt.admin.api.feign.RemoteDictService;
@@ -41,7 +41,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
@@ -71,15 +70,10 @@
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);
+ 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());
@@ -96,26 +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();
- excelReader.read(readSheet);
- } 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
@@ -195,6 +190,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('technology_structure_add')")
public R save(@RequestBody StructureDTO structure) {
+ System.out.println("===========================>"+structure);
return structureService.fullSave(structure);
}
--
Gitblit v1.9.3