fix(eims): 优化设备导入功能

baoshiwei

2025-06-17 326d21b896b6a3f2644a92829a96f5db38fb9560

fix(eims): 优化设备导入功能

- 增加资产编号为空的检查，为空则跳过当前数据
- 为新设备设置默认状态为"正常"- 更新现有设备时，设置设备 ID 和导入状态
- 修复更新成功后成功数量和消息的更新逻辑

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java

@@ -87,10 +87,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 +108,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(" 已存在");