diff --git a/pom.xml b/pom.xml
index 744bf97..de35cf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,14 +47,14 @@
org.apache.poi
poi
- 3.9
+ 4.1.2
org.apache.poi
poi-ooxml
- 3.9
+ 4.1.2
diff --git a/src/main/java/com/gmh/controller/ExcelController.java b/src/main/java/com/gmh/controller/ExcelController.java
index 73f3729..26a562d 100644
--- a/src/main/java/com/gmh/controller/ExcelController.java
+++ b/src/main/java/com/gmh/controller/ExcelController.java
@@ -1,24 +1,31 @@
package com.gmh.controller;
-import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.gmh.entity.GmhUser;
import com.gmh.entity.R;
+import com.gmh.entity.SysBaijiaxing;
+import com.gmh.entity.vo.ReadNameVo;
+import com.gmh.service.SysBaijiaxingService;
import com.gmh.utils.POIExcelUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/excel")
public class ExcelController {
+ public final ThreadLocal workbookThreadLocal = new ThreadLocal<>();
+
+ private static final String KEY_XINGMING = "姓名";
+
@RequestMapping("/t01")
public R test01() {
return R.ok("ok");
@@ -27,58 +34,139 @@ public class ExcelController {
@RequestMapping("/readData")
public R readSourceData(MultipartFile file) throws IOException {
Workbook workbook = POIExcelUtil.readExcelFromInputStream(file.getInputStream(), file.getOriginalFilename());
- Integer nameCellIndex = null;
- Map> sheetNameList = new LinkedHashMap<>();
+ List resultList = new ArrayList<>();
for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
- List nameList = new ArrayList<>();
+ ReadNameVo readNameVo = new ReadNameVo();
Sheet sheet = workbook.getSheetAt(i);
- for (int r = 0; r <= sheet.getLastRowNum(); r++) {
- Row row = sheet.getRow(r);
- if (row == null) {
- continue;
+ List