mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 12:52:07 +08:00
取消板件自动写入逻辑修改
This commit is contained in:
+1
-1
@@ -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);
|
||||
|
||||
+2
-1
@@ -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<T> extends ExcelListener<PlateImportExcelV
|
||||
*
|
||||
* @return 返回读取的数据集合
|
||||
**/
|
||||
public List<PlateImportExcelVO> getDatas() {
|
||||
public List<PlateImportExcelVO> getDates() {
|
||||
return datas;
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user