From 7b4cd6ef04b358e0805846d49e3acf02d7eae5cb Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 30 七月 2025 11:08:33 +0800
Subject: [PATCH] feat(eims): 更新预测性维护功能 - 新增设备数据定时更新功能 - 添加维护建议滚动显示 - 更新设备部件寿命预测数据 - 调整备件库存与预警逻辑 - 优化数据展示和颜色提示
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 2fd2310..23d1e31 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
@@ -21,7 +21,6 @@
import org.dromara.eims.domain.vo.EimsEquImportVo;
import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.service.IEimsEquService;
-import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.service.ISysUserService;
import java.util.List;
@@ -87,10 +86,17 @@
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);
@@ -101,9 +107,12 @@
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(" 宸插瓨鍦�");
@@ -156,7 +165,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