opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-08-02 05:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Support Type Query

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-08-26 16:03:44 +08:00
parent bc8f5a2a8e
commit 2a0def8d52
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java
View File

@ -189,7 +189,7 @@ public class DataSourceServiceImpl implements DataSourceService {
LoginUser loginUser = ContextUtils.getLoginUser();
IPage<DataSourceDO> 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<DataSource> dataSources = dataSourceConverter.do2dto(iPage.getRecords());
fillData(dataSources, selector);

3
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceCustomMapper.java
View File

@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface DataSourceCustomMapper extends Mapper<DataSourceDO> {
IPage<DataSourceDO> selectPageWithPermission(IPage<DataSourceDO> 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);
}

3
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceCustomMapper.xml
View File

@ -33,6 +33,9 @@
<if test="searchKey != '' and searchKey != null ">
and (ds.alias like concat('%',#{searchKey},'%') or ds.url like concat('%',#{searchKey},'%'))
</if>
<if test="kind != null ">
and ds.kind = #{kind}
</if>
</where>
</select>
</mapper>

4
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/common/converter/CommonAdminConverter.java
View File

@ -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);

6
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceQueryRequest.java
View File

@ -16,4 +16,10 @@ public class DataSourceQueryRequest extends PageQueryRequest {
* 别名模糊搜索词
*/
private String searchKey;
/**
* 连接类型
*
* @see ai.chat2db.server.domain.api.enums.DataSourceKindEnum
*/
private String kind;
}