From 2a0def8d524b9ff6c292e34cca7bfc62746ecde3 Mon Sep 17 00:00:00 2001 From: JiaJu Zhuang <5152853@qq.com> Date: Sat, 26 Aug 2023 16:03:44 +0800 Subject: [PATCH] Add Support Type Query --- .../server/domain/core/impl/DataSourceServiceImpl.java | 2 +- .../domain/repository/mapper/DataSourceCustomMapper.java | 3 +-- .../src/main/resources/mapper/DataSourceCustomMapper.xml | 3 +++ .../controller/common/converter/CommonAdminConverter.java | 4 +++- .../data/source/request/DataSourceQueryRequest.java | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java index ef08f680..b299b076 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java @@ -189,7 +189,7 @@ public class DataSourceServiceImpl implements DataSourceService { LoginUser loginUser = ContextUtils.getLoginUser(); IPage iPage = dataSourceCustomMapper.selectPageWithPermission( new Page<>(param.getPageNo(), param.getPageSize()), - BooleanUtils.isTrue(loginUser.getAdmin()), loginUser.getId(), param.getSearchKey()); + BooleanUtils.isTrue(loginUser.getAdmin()), loginUser.getId(), param.getSearchKey(),param.getKind()); List dataSources = dataSourceConverter.do2dto(iPage.getRecords()); fillData(dataSources, selector); diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java index 249f5fcb..d90a05fc 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java @@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Param; */ public interface DataSourceCustomMapper extends Mapper { IPage selectPageWithPermission(IPage page, @Param("admin") Boolean admin, - @Param("userId") Long userId, - @Param("searchKey") String searchKey); + @Param("userId") Long userId, @Param("searchKey") String searchKey, @Param("kind") String kind); } diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml index 89e622a8..569248ab 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml @@ -33,6 +33,9 @@ and (ds.alias like concat('%',#{searchKey},'%') or ds.url like concat('%',#{searchKey},'%')) + + and ds.kind = #{kind} + diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/common/converter/CommonAdminConverter.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/common/converter/CommonAdminConverter.java index 24034a69..c3468591 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/common/converter/CommonAdminConverter.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/common/converter/CommonAdminConverter.java @@ -6,6 +6,7 @@ import ai.chat2db.server.admin.api.controller.team.vo.SimpleTeamVO; import ai.chat2db.server.admin.api.controller.user.vo.SimpleUserVO; import ai.chat2db.server.common.api.controller.request.CommonQueryRequest; import ai.chat2db.server.domain.api.enums.AccessObjectTypeEnum; +import ai.chat2db.server.domain.api.enums.DataSourceKindEnum; import ai.chat2db.server.domain.api.model.DataSource; import ai.chat2db.server.domain.api.model.Team; import ai.chat2db.server.domain.api.model.User; @@ -21,7 +22,7 @@ import org.mapstruct.Mappings; * * @author Jiaju Zhuang */ -@Mapper(componentModel = "spring", imports = {AccessObjectTypeEnum.class}) +@Mapper(componentModel = "spring", imports = {AccessObjectTypeEnum.class, DataSourceKindEnum.class}) public abstract class CommonAdminConverter { /** @@ -54,6 +55,7 @@ public abstract class CommonAdminConverter { */ @Mappings({ @Mapping(target = "pageSize", expression = "java(10)"), + @Mapping(target = "kind", expression = "java(DataSourceKindEnum.SHARED.getCode())"), }) public abstract DataSourcePageQueryParam request2paramDataSource(CommonQueryRequest request); diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceQueryRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceQueryRequest.java index 141f927f..28cbef2a 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceQueryRequest.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceQueryRequest.java @@ -16,4 +16,10 @@ public class DataSourceQueryRequest extends PageQueryRequest { * 别名模糊搜索词 */ private String searchKey; + /** + * 连接类型 + * + * @see ai.chat2db.server.domain.api.enums.DataSourceKindEnum + */ + private String kind; }