From 326d21b896b6a3f2644a92829a96f5db38fb9560 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 17 六月 2025 10:18:48 +0800
Subject: [PATCH] fix(eims): 优化设备导入功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
index dbd984e..bf9b051 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
@@ -7,6 +7,7 @@
import com.alibaba.excel.exception.ExcelDataConvertException;
import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.DictConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.DictService;
import org.dromara.common.core.utils.DateUtils;
@@ -60,7 +61,7 @@
this.dictService = SpringUtils.getBean(DictService.class);
this.isUpdateSupport = isUpdateSupport;
this.operUserId = LoginHelper.getUserId();
- this.unitDictMap = dictService.getAllDictByDictType(CacheConstants.EIMS_EQU_UNIT);
+ this.unitDictMap = dictService.getAllDictByDictType(DictConstants.EIMS_EQU_UNIT);
}
@Override
@@ -86,23 +87,33 @@
e.printStackTrace();
}
}
+ // 濡傛灉璧勪骇缂栧彿涓虹┖鍒欒烦杩囨鏉℃暟鎹�
+ if (StringUtils.isEmpty(equVo.getAssetNo())) {
+ return;
+ }
+
+ EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class);
+ equ.setStatus(dictService.getDictValue(DictConstants.EIMS_EQU_STATUS,"姝ｅ父"));
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
if (ObjectUtil.isNull(eimsEquVo)) {
- EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class);
+
// TODO 鏍￠獙
//ValidatorUtils.validate(equ);
//娣诲姞瀛楁榛樿灞炴��
- equ.setImportStatus(dictService.getDictValue(CacheConstants.EIMS_IMPORT_STATUS,"鏂板鍏�"));
+ equ.setImportStatus(dictService.getDictValue(DictConstants.EIMS_IMPORT_STATUS,"鏂板鍏�"));
equ.setCreateBy(operUserId);
equService.insertByBo(equ);
successNum++;
successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
+ equ.setEquId(eimsEquVo.getEquId());
+ equService.updateByBo(equ);
+ equ.setImportStatus(dictService.getDictValue(DictConstants.EIMS_IMPORT_STATUS,"鏇存柊"));
// TODO 鎵ц瑕嗙洊閫昏緫
- //successNum++;
- //successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 鏇存柊鎴愬姛");
+ successNum++;
+ successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 鏇存柊鎴愬姛");
} else {
failureNum++;
failureMsg.append("<br/>").append(failureNum).append("銆佽澶� ").append(eimsEquVo.getEquName()).append(eimsEquVo.getAssetNo()).append(" 宸插瓨鍦�");
@@ -155,7 +166,7 @@
if (exception instanceof ExcelDataConvertException) {
ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
log.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
- excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData());
+ excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData().getData());
}
}
--
Gitblit v1.9.3