diff --git a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java index d3227c8c6..e925bc201 100644 --- a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java @@ -227,7 +227,7 @@ public class GlobalExceptionHandler { // 文件格式错误处理 if (rootCause instanceof IOException) { // 使用正则提取数值 - Pattern pattern = Pattern.compile("Numeric value \\((\\d+)\\) out of range"); + Pattern pattern = Pattern.compile("Numeric value \\(([-+]?\\d*\\.?\\d+(?:[eE][-+]?\\d+)?)\\) out of range"); Matcher matcher = pattern.matcher(rootCause.getMessage()); if (matcher.find()) { String invalidValue = matcher.group(1); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java index 1e0c28ee6..87a473419 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java @@ -1,6 +1,7 @@ package com.cf.imes.module.manage.service.plate; import com.alibaba.excel.context.AnalysisContext; +import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; import com.cf.imes.module.manage.util.file.ExcelListener; import lombok.extern.slf4j.Slf4j; @@ -98,7 +99,7 @@ public final class PlateExcelListener extends ExcelListener getDatas() { + public List getDates() { return datas; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java index c8ed54db4..a8fe8af3d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java @@ -368,6 +368,8 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand @Override public void modifySystemConfig(ConfigSaveReqVO reqVO) { + // 记录当前版本配置状态 + int status = getSystemConfig(reqVO.getId()).getStatus(); // 校验规则 checkValid(reqVO.getSetting()); // 系统配置保存前操作 @@ -382,7 +384,7 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand // 更新 systemConfigMapper.updateById(systemConfigDO); } else { - systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class); + systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class).setStatus(status); // 新增 systemConfigMapper.insert(systemConfigDO); }