refactor(excel): 优化Excel工具类处理逻辑

- 将fullySyncCustomer接口的@PostMapping注解改为@RequestMapping - ExcelUtils增加@Slf4j注解用于日志记录 - 使用DataFormatter处理Excel单元格值，提升数据读取准确性 - 改进表头读取逻辑，支持动态列映射 - 增加对空单元格的处理，返回null而非空字符串 - 为TaxTenantController的call方法添加默认"value"字段

refactor(excel): 优化Excel工具类处理逻辑
- 将fullySyncCustomer接口的@PostMapping注解改为@RequestMapping - ExcelUtils增加@Slf4j注解用于日志记录 - 使用DataFormatter处理Excel单元格值，提升数据读取准确性 - 改进表头读取逻辑，支持动态列映射 - 增加对空单元格的处理，返回null而非空字符串 - 为TaxTenantController的call方法添加默认"value"字段
zhangmeiyang
1 parent fe281fad
Showing 3 changed files with 22 additions and 4 deletions
tax-adopt/src/main/java/com/diligrp/tax/adopt/api/AdoptMessageController.java
tax-adopt/src/main/java/com/diligrp/tax/adopt/util/ExcelUtils.java
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxTenantController.java
@@ -41,7 +41,7 @@ public class AdoptMessageController {
      * @param documentType 文档类型
      * @return {@link Message }<{@link ? }>
      */
-    @PostMapping("/fullySyncCustomer/{group}/{entity}/{pipelineCode}/{documentType}")
+    @RequestMapping("/fullySyncCustomer/{group}/{entity}/{pipelineCode}/{documentType}")
     public Message<?> fullySyncCustomer(@RequestPart("file") @NotNull MultipartFile file,
                                         @PathVariable("group") String group,
                                         @PathVariable("entity") String entity,
@@ -2,6 +2,9 @@ package com.diligrp.tax.adopt.util;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.type.TaxSystemType;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.Workbook;
 import java.util.*;
@@ -11,15 +14,29 @@ import java.util.*;
  * @CreateTime: 2025-11-19 15:11
  * @Version: todo
  */
+@Slf4j
 public class ExcelUtils {
     public static List<Map<String, Object>> processSheet(Workbook book) {
         var res = new ArrayList<Map<String, Object>>();
         Optional.ofNullable(book).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.ABNORMAL_PARAMETERS, "文件转换异常"));
+        var header = new HashMap<Integer, String>();
         book.sheetIterator().forEachRemaining(sheet -> sheet.rowIterator().forEachRemaining(row -> {
-            var map = new HashMap<String, Object>();
-            row.cellIterator().forEachRemaining(cell -> map.put(cell.getStringCellValue(), cell.getStringCellValue()));
-            res.add(map);
+            switch (row.getRowNum()) {
+                case 0 -> log.info("sheetName: {}", sheet.getSheetName());
+                case 1 -> row.cellIterator().forEachRemaining(cell -> header.put(cell.getColumnIndex(), cell.getStringCellValue()));
+                default -> {
+                    var map = new HashMap<String, Object>();
+                    row.cellIterator().forEachRemaining(cell -> map.put(header.get(cell.getColumnIndex()), getStringCellValue(cell)));
+                    res.add(map);
+                }
+            }
         }));
         return res;
     }
+
+    private static String getStringCellValue(Cell cell) {
+        DataFormatter formatter = new DataFormatter();
+        String rawValue = formatter.formatCellValue(cell); // 获取单元格显示值
+        return rawValue.trim().isEmpty() ? null : rawValue;
+    }
 }
@@ -30,6 +30,7 @@ public class TaxTenantController {
     @RequestMapping("call")
     public Message<?> call(@RequestBody Map<String, Object> map) {
+        map.put("value","101");
         return Message.success(map);
     }