From 7081c41bc3beb0ab49a22974ea4b010ae6854afe Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 13:07:52 +0800
Subject: [PATCH] feat: 全量列表页补 Excel 导入接口,清理 crm/mdm 重复 FQCN 类
---
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
index 75ba722..0f31b15 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
@@ -1,7 +1,13 @@
package cn.iocoder.yudao.module.infra.service.db;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.util.JdbcUtils;
+import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigImportExcelVO;
+import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigImportReqVO;
+import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigImportRespVO;
import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigSaveReqVO;
import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.iocoder.yudao.module.infra.dal.mysql.db.DataSourceConfigMapper;
@@ -9,12 +15,18 @@
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_IMPORT_LIST_IS_EMPTY;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_IMPORT_NAME_EXISTS;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_EXISTS;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_OK;
@@ -108,4 +120,46 @@
.setPassword(dataSourceProperty.getPassword());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public DataSourceConfigImportRespVO importDataSourceConfigList(List<DataSourceConfigImportExcelVO> importDataSourceConfigs,
+ DataSourceConfigImportReqVO importReqVO) {
+ // 1. 鏍¢獙闈炵┖
+ importDataSourceConfigs = filterList(importDataSourceConfigs, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importDataSourceConfigs)) {
+ throw exception(DATA_SOURCE_CONFIG_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ DataSourceConfigImportRespVO respVO = DataSourceConfigImportRespVO.builder()
+ .createDataSourceConfigNames(new ArrayList<>())
+ .updateDataSourceConfigNames(new ArrayList<>())
+ .failureDataSourceConfigNames(new LinkedHashMap<>())
+ .build();
+ importDataSourceConfigs.forEach(importConfig -> {
+ try {
+ DataSourceConfigDO existConfig = dataSourceConfigMapper.selectByName(importConfig.getName());
+ if (existConfig == null) {
+ // 鏂板
+ DataSourceConfigDO config = BeanUtils.toBean(importConfig, DataSourceConfigDO.class);
+ dataSourceConfigMapper.insert(config);
+ respVO.getCreateDataSourceConfigNames().add(importConfig.getName());
+ return;
+ }
+ // 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureDataSourceConfigNames().put(importConfig.getName(),
+ StrUtil.format(DATA_SOURCE_CONFIG_IMPORT_NAME_EXISTS.getMsg(), importConfig.getName()));
+ return;
+ }
+ DataSourceConfigDO updateConfig = BeanUtils.toBean(importConfig, DataSourceConfigDO.class)
+ .setId(existConfig.getId());
+ dataSourceConfigMapper.updateById(updateConfig);
+ respVO.getUpdateDataSourceConfigNames().add(importConfig.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureDataSourceConfigNames().put(importConfig.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3