From 940f06f6d8e5508f39bd7f8ce7791d60bfc0686c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 07 十一月 2023 14:11:21 +0800
Subject: [PATCH] Changes
---
mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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..67f390b 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;
@@ -69,17 +68,32 @@
*/
@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 {
- 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, 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());
@@ -104,7 +118,8 @@
try {
excelReader = EasyExcel.read(file.getInputStream(), StructureData.class, new StructureUploadListener(structureService, dictUtils)).build();
ReadSheet readSheet = EasyExcel.readSheet(0).build();
- excelReader.read(readSheet);
+ ReadSheet readSheet2 = EasyExcel.readSheet(1).build();
+ excelReader.read(readSheet,readSheet2);
} catch (IOException e) {
e.printStackTrace();
return R.failed(e.getMessage());
@@ -195,6 +210,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