✨ 批量导入日期宽容解析：兼容 2026-08-02 与 2026-8-2 等书写变体
- blade-common 新增 LenientDateParser（宽容解析：- / . 分隔符、补零与否、 时间可省略秒/分；拒绝两位年份、日在前、无分隔符） - 新增 LenientDateStringConverter / LenientDateTimeStringConverter： Excel 数值日期转文本透传，文本解析留待服务层以进入失败明细流程 - 8 个裸走 fastexcel 内置转换的导入 DTO（保险/年检/事故/其他费用/运单/ 币种/用户生日/设备台账）日期字段改为 String 承载，服务层统一经 LenientDateParser 解析，失败报「<列名> 日期格式无法识别：<原值>」 - MaintenancePlanDateTimeConverter / TireReplacementDateStringConverter 内部委托公共解析器，6 个 DTO 注解零改动 - 运输计划、运单批量、运输对账、换胎 4 处手动解析点收敛至同一工具类 - UserMapper 导出 SQL 的生日改 DATE_FORMAT 输出，保持导出格式不变 口径见根工作区 docs/import-spec.md（weicw/tms-erp#1）。 回归：port-terminal 45 断言、violation-record 40 断言（含新增不补零 用例 09）、waybill-import 48 断言、insurance-record 新增用例 6 断言， 全部通过。
This commit is contained in:
@@ -22,6 +22,10 @@
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-starter-loadbalancer</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-starter-log</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-core-auto</artifactId>
|
||||
|
||||
@@ -0,0 +1,198 @@
|
||||
/**
|
||||
* BladeX Commercial License Agreement
|
||||
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
|
||||
* <p>
|
||||
* Use of this software is governed by the Commercial License Agreement
|
||||
* obtained after purchasing a license from BladeX.
|
||||
* <p>
|
||||
* 1. This software is for development use only under a valid license
|
||||
* from BladeX.
|
||||
* <p>
|
||||
* 2. Redistribution of this software's source code to any third party
|
||||
* without a commercial license is strictly prohibited.
|
||||
* <p>
|
||||
* 3. Licensees may copyright their own code but cannot use segments
|
||||
* from this software for such purposes. Copyright of this software remains with BladeX.
|
||||
* <p>
|
||||
* Using this software signifies agreement to this License, and the software
|
||||
* must not be used for illegal purposes.
|
||||
* <p>
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
|
||||
* not liable for any claims arising from secondary or illegal development.
|
||||
* <p>
|
||||
* Author: Chill Zhuang (bladejava@qq.com)
|
||||
*/
|
||||
package org.springblade.common.excel;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* 批量导入宽容日期解析器（口径见根工作区 docs/import-spec.md）。
|
||||
* <p>
|
||||
* 解析规则：
|
||||
* <ul>
|
||||
* <li>分隔符 {@code -}、{@code /}、{@code .} 均接受；补零与否均可（2026-08-02 ≡ 2026-8-2）</li>
|
||||
* <li>日期时间：日期部分同上，时间 HH:mm:ss，可省略秒或秒+分（2026-8-2 12:3 可解析）</li>
|
||||
* <li>拒绝：两位年份（26-8-2）、日在前（2/8/2026）、无分隔符（20260802）</li>
|
||||
* </ul>
|
||||
*
|
||||
* @author Chill
|
||||
*/
|
||||
public final class LenientDateParser {
|
||||
|
||||
/**
|
||||
* 日期部分：4 位年 + 分隔符 + 1~2 位月 + 同一分隔符 + 1~2 位日（年在前，拒绝两位年份与日在前）。
|
||||
*/
|
||||
private static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4})([-/.])(\\d{1,2})\\2(\\d{1,2})");
|
||||
|
||||
/**
|
||||
* 时间部分：1~2 位时[:1~2 位分[:1~2 位秒]]，逐级可省略。
|
||||
*/
|
||||
private static final Pattern TIME_PATTERN = Pattern.compile("(\\d{1,2})(?::(\\d{1,2})(?::(\\d{1,2}))?)?");
|
||||
|
||||
private LenientDateParser() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期文本，失败返回 {@code null}。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @return 日期；无法识别时返回 null
|
||||
*/
|
||||
public static LocalDate parseDateOrNull(String value) {
|
||||
String normalized = normalize(value);
|
||||
if (normalized == null) {
|
||||
return null;
|
||||
}
|
||||
Matcher matcher = DATE_PATTERN.matcher(normalized);
|
||||
if (!matcher.matches()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return LocalDate.of(Integer.parseInt(matcher.group(1)),
|
||||
Integer.parseInt(matcher.group(3)), Integer.parseInt(matcher.group(4)));
|
||||
} catch (NumberFormatException | java.time.DateTimeException exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期文本；允许携带合法时间部分并截断（如 2026-9-1 8:0:0 按 2026-09-01 解析，
|
||||
* 与 fastexcel 内置 LocalDate 转换的既有宽容度保持一致），失败返回 {@code null}。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @return 日期；无法识别时返回 null
|
||||
*/
|
||||
public static LocalDate parseDateLenientlyOrNull(String value) {
|
||||
LocalDate date = parseDateOrNull(value);
|
||||
if (date != null) {
|
||||
return date;
|
||||
}
|
||||
LocalDateTime dateTime = parseDateTimeOrNull(value);
|
||||
return dateTime == null ? null : dateTime.toLocalDate();
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期时间文本；纯日期按当日零点处理，失败返回 {@code null}。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @return 日期时间；无法识别时返回 null
|
||||
*/
|
||||
public static LocalDateTime parseDateTimeOrNull(String value) {
|
||||
String normalized = normalize(value);
|
||||
if (normalized == null) {
|
||||
return null;
|
||||
}
|
||||
// 拆出日期与时间两部分；中间允许 1 个及以上空白或小写 t（2026-8-2t12:3 亦接受）。
|
||||
String[] parts = normalized.split("[ \\t]+|(?<=\\d)t", 2);
|
||||
if (parts.length == 0) {
|
||||
return null;
|
||||
}
|
||||
LocalDate date = parseDateOrNull(parts[0]);
|
||||
if (date == null) {
|
||||
return null;
|
||||
}
|
||||
if (parts.length == 1) {
|
||||
return date.atStartOfDay();
|
||||
}
|
||||
Matcher matcher = TIME_PATTERN.matcher(parts[1]);
|
||||
if (!matcher.matches()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
int hour = Integer.parseInt(matcher.group(1));
|
||||
int minute = matcher.group(2) == null ? 0 : Integer.parseInt(matcher.group(2));
|
||||
int second = matcher.group(3) == null ? 0 : Integer.parseInt(matcher.group(3));
|
||||
return LocalDateTime.of(date, LocalTime.of(hour, minute, second));
|
||||
} catch (NumberFormatException | java.time.DateTimeException exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期文本，失败抛出携带口径文案的 {@link org.springblade.core.log.exception.ServiceException}。
|
||||
* 空白与 {@code null} 返回 {@code null}（可选字段由业务校验决定是否必填）。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @param columnName 导入模板列名（用于失败原因文案与失败明细标红定位）
|
||||
* @return 日期
|
||||
*/
|
||||
public static LocalDate parseDate(String value, String columnName) {
|
||||
if (value == null || value.trim().isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
LocalDate date = parseDateLenientlyOrNull(value);
|
||||
if (date == null) {
|
||||
throw unrecognizedDate(value, columnName);
|
||||
}
|
||||
return date;
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期时间文本，失败抛出携带口径文案的 {@link org.springblade.core.log.exception.ServiceException}。
|
||||
* 空白与 {@code null} 返回 {@code null}（可选字段由业务校验决定是否必填）。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @param columnName 导入模板列名（用于失败原因文案与失败明细标红定位）
|
||||
* @return 日期时间
|
||||
*/
|
||||
public static LocalDateTime parseDateTime(String value, String columnName) {
|
||||
if (value == null || value.trim().isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
LocalDateTime dateTime = parseDateTimeOrNull(value);
|
||||
if (dateTime == null) {
|
||||
throw unrecognizedDate(value, columnName);
|
||||
}
|
||||
return dateTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按口径构造「日期格式无法识别」错误。
|
||||
*
|
||||
* @param value 单元格原始文本
|
||||
* @param columnName 导入模板列名
|
||||
* @return 业务异常
|
||||
*/
|
||||
public static org.springblade.core.log.exception.ServiceException unrecognizedDate(String value, String columnName) {
|
||||
String displayName = columnName == null || columnName.isBlank() ? "日期" : columnName;
|
||||
return new org.springblade.core.log.exception.ServiceException(
|
||||
displayName + " 日期格式无法识别：" + (value == null ? "" : value.trim()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 归一化输入：去首尾空白，跳过空白值。
|
||||
*/
|
||||
private static String normalize(String value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
String normalized = value.trim();
|
||||
return normalized.isEmpty() ? null : normalized;
|
||||
}
|
||||
|
||||
}
|
||||
+75
@@ -0,0 +1,75 @@
|
||||
/**
|
||||
* BladeX Commercial License Agreement
|
||||
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
|
||||
* <p>
|
||||
* Use of this software is governed by the Commercial License Agreement
|
||||
* obtained after purchasing a license from BladeX.
|
||||
* <p>
|
||||
* 1. This software is for development use only under a valid license
|
||||
* from BladeX.
|
||||
* <p>
|
||||
* 2. Redistribution of this software's source code to any third party
|
||||
* without a commercial license is strictly prohibited.
|
||||
* <p>
|
||||
* 3. Licensees may copyright their own code but cannot use segments
|
||||
* from this software for such purposes. Copyright of this software remains with BladeX.
|
||||
* <p>
|
||||
* Using this software signifies agreement to this License, and the software
|
||||
* must not be used for illegal purposes.
|
||||
* <p>
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
|
||||
* not liable for any claims arising from secondary or illegal development.
|
||||
* <p>
|
||||
* Author: Chill Zhuang (bladejava@qq.com)
|
||||
*/
|
||||
package org.springblade.common.excel;
|
||||
|
||||
import cn.idev.excel.converters.Converter;
|
||||
import cn.idev.excel.enums.CellDataTypeEnum;
|
||||
import cn.idev.excel.metadata.GlobalConfiguration;
|
||||
import cn.idev.excel.metadata.data.ReadCellData;
|
||||
import cn.idev.excel.metadata.data.WriteCellData;
|
||||
import cn.idev.excel.metadata.property.ExcelContentProperty;
|
||||
import cn.idev.excel.util.DateUtils;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 批量导入宽容日期转换器（String 承载）：Excel 数值日期（序列号）转 ISO 文本，文本原样透传。
|
||||
* <p>
|
||||
* 文本的宽容解析由服务层调用 {@link LenientDateParser} 完成，不在此处抛错——
|
||||
* 转换器阶段抛出的异常会被 fastexcel 包装成 ExcelDataConvertException 直接中断读取，
|
||||
* 无法进入导入失败明细流程。口径见根工作区 docs/import-spec.md。
|
||||
*
|
||||
* @author Chill
|
||||
*/
|
||||
public class LenientDateStringConverter implements Converter<String> {
|
||||
|
||||
@Override
|
||||
public Class<?> supportJavaTypeKey() {
|
||||
return String.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CellDataTypeEnum supportExcelTypeKey() {
|
||||
return CellDataTypeEnum.STRING;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
|
||||
GlobalConfiguration globalConfiguration) {
|
||||
if (cellData.getType() == CellDataTypeEnum.NUMBER) {
|
||||
LocalDate date = DateUtils.getLocalDateTime(cellData.getNumberValue().doubleValue(),
|
||||
globalConfiguration.getUse1904windowing()).toLocalDate();
|
||||
return date.toString();
|
||||
}
|
||||
return cellData.getStringValue();
|
||||
}
|
||||
|
||||
@Override
|
||||
public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty,
|
||||
GlobalConfiguration globalConfiguration) {
|
||||
return new WriteCellData<>(value);
|
||||
}
|
||||
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
/**
|
||||
* BladeX Commercial License Agreement
|
||||
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
|
||||
* <p>
|
||||
* Use of this software is governed by the Commercial License Agreement
|
||||
* obtained after purchasing a license from BladeX.
|
||||
* <p>
|
||||
* 1. This software is for development use only under a valid license
|
||||
* from BladeX.
|
||||
* <p>
|
||||
* 2. Redistribution of this software's source code to any third party
|
||||
* without a commercial license is strictly prohibited.
|
||||
* <p>
|
||||
* 3. Licensees may copyright their own code but cannot use segments
|
||||
* from this software for such purposes. Copyright of this software remains with BladeX.
|
||||
* <p>
|
||||
* Using this software signifies agreement to this License, and the software
|
||||
* must not be used for illegal purposes.
|
||||
* <p>
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
|
||||
* not liable for any claims arising from secondary or illegal development.
|
||||
* <p>
|
||||
* Author: Chill Zhuang (bladejava@qq.com)
|
||||
*/
|
||||
package org.springblade.common.excel;
|
||||
|
||||
import cn.idev.excel.converters.Converter;
|
||||
import cn.idev.excel.enums.CellDataTypeEnum;
|
||||
import cn.idev.excel.metadata.GlobalConfiguration;
|
||||
import cn.idev.excel.metadata.data.ReadCellData;
|
||||
import cn.idev.excel.metadata.data.WriteCellData;
|
||||
import cn.idev.excel.metadata.property.ExcelContentProperty;
|
||||
import cn.idev.excel.util.DateUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
/**
|
||||
* 批量导入宽容日期时间转换器（String 承载）：Excel 数值日期（序列号）转
|
||||
* {@code yyyy-MM-dd HH:mm:ss} 文本，文本原样透传。
|
||||
* <p>
|
||||
* 文本的宽容解析由服务层调用 {@link LenientDateParser} 完成，不在此处抛错——
|
||||
* 转换器阶段抛出的异常会被 fastexcel 包装成 ExcelDataConvertException 直接中断读取，
|
||||
* 无法进入导入失败明细流程。口径见根工作区 docs/import-spec.md。
|
||||
*
|
||||
* @author Chill
|
||||
*/
|
||||
public class LenientDateTimeStringConverter implements Converter<String> {
|
||||
|
||||
/**
|
||||
* 数值日期序列号转文本的输出格式，与导入模板展示格式保持一致。
|
||||
*/
|
||||
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
@Override
|
||||
public Class<?> supportJavaTypeKey() {
|
||||
return String.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CellDataTypeEnum supportExcelTypeKey() {
|
||||
return CellDataTypeEnum.STRING;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
|
||||
GlobalConfiguration globalConfiguration) {
|
||||
if (cellData.getType() == CellDataTypeEnum.NUMBER) {
|
||||
LocalDateTime dateTime = DateUtils.getLocalDateTime(cellData.getNumberValue().doubleValue(),
|
||||
globalConfiguration.getUse1904windowing());
|
||||
return dateTime.format(DATE_TIME_FORMATTER);
|
||||
}
|
||||
return cellData.getStringValue();
|
||||
}
|
||||
|
||||
@Override
|
||||
public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty,
|
||||
GlobalConfiguration globalConfiguration) {
|
||||
return new WriteCellData<>(value);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user