From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/config/BiDataSourceConfigServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/config/BiDataSourceConfigServiceImpl.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/config/BiDataSourceConfigServiceImpl.java
index df9b003..601b19e 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/config/BiDataSourceConfigServiceImpl.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/config/BiDataSourceConfigServiceImpl.java
@@ -1,7 +1,14 @@
package cn.iocoder.yudao.module.bi.service.config;
+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.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportExcelVO;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportReqVO;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportRespVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.BiDataSourceConfigDO;
import cn.iocoder.yudao.module.bi.dal.mysql.BiDataSourceConfigMapper;
import cn.iocoder.yudao.module.bi.enums.ErrorCodeConstants;
@@ -9,8 +16,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
/**
* 鏁版嵁婧愰厤缃� Service 瀹炵幇
@@ -47,13 +60,57 @@
}
@Override
- public PageResult<BiDataSourceConfigDO> getPage(Integer pageNo, Integer pageSize) {
+ public PageResult<BiDataSourceConfigDO> getPage(String name, String type, Integer pageNo, Integer pageSize) {
IPage<BiDataSourceConfigDO> page = mapper.selectPage(new Page<>(pageNo, pageSize),
new LambdaQueryWrapperX<BiDataSourceConfigDO>()
+ .likeIfPresent(BiDataSourceConfigDO::getName, name)
+ .eqIfPresent(BiDataSourceConfigDO::getType, type)
.orderByDesc(BiDataSourceConfigDO::getCreateTime));
return new PageResult<>(page.getRecords(), page.getTotal());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BiDataSourceConfigImportRespVO importDataSourceConfigList(List<BiDataSourceConfigImportExcelVO> importList,
+ BiDataSourceConfigImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importList = filterList(importList, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(ErrorCodeConstants.BI_DATA_SOURCE_CONFIG_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ BiDataSourceConfigImportRespVO respVO = BiDataSourceConfigImportRespVO.builder()
+ .createDataSourceConfigNames(new ArrayList<>())
+ .updateDataSourceConfigNames(new ArrayList<>())
+ .failureDataSourceConfigNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(item -> {
+ try {
+ BiDataSourceConfigDO exist = mapper.selectByName(item.getName());
+ if (exist == null) {
+ // 2.1 鏂板
+ BiDataSourceConfigDO config = BeanUtils.toBean(item, BiDataSourceConfigDO.class);
+ mapper.insert(config);
+ respVO.getCreateDataSourceConfigNames().add(item.getName());
+ return;
+ }
+ // 2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureDataSourceConfigNames().put(item.getName(),
+ StrUtil.format(ErrorCodeConstants.BI_DATA_SOURCE_CONFIG_NAME_EXISTS.getMsg(), item.getName()));
+ return;
+ }
+ BiDataSourceConfigDO updateObj = BeanUtils.toBean(item, BiDataSourceConfigDO.class)
+ .setId(exist.getId());
+ mapper.updateById(updateObj);
+ respVO.getUpdateDataSourceConfigNames().add(item.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureDataSourceConfigNames().put(item.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
private void validateExists(Long id) {
if (mapper.selectById(id) == null) {
throw exception(ErrorCodeConstants.BI_DATA_SOURCE_CONFIG_NOT_EXISTS);
--
Gitblit v1.9.3