opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-30 11:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Complete team user code

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-08-13 19:42:00 +08:00
parent 4a19c57b37
commit 0ecf290b83
14 changed files with 136 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserDataSourceAdminController.java
View File

@ -3,8 +3,8 @@ package ai.chat2db.server.admin.api.controller.user;
import ai.chat2db.server.admin.api.controller.user.converter.UserDataSourcesAdminConverter;
import ai.chat2db.server.admin.api.controller.user.request.UserDataSourceBatchCreateRequest;
import ai.chat2db.server.admin.api.controller.user.request.UserTeamPageCommonQueryRequest;
import ai.chat2db.server.admin.api.controller.user.vo.UserDataSourcePageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.enums.AccessObjectTypeEnum;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessCreatParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class UserDataSourceAdminController {
private static final DataSourceAccessSelector DATA_SOURCE_ACCESS_SELECTOR = DataSourceAccessSelector.builder()
.accessObject(Boolean.TRUE)
.dataSource(Boolean.TRUE)
.build();
@Resource
@ -46,7 +46,7 @@ public class UserDataSourceAdminController {
* @version 2.1.0
*/
@GetMapping("/page")
public WebPageResult<UserDataSourcePageQueryVO> page(@Valid CommonPageQueryRequest request) {
public WebPageResult<UserDataSourcePageQueryVO> page(@Valid UserTeamPageCommonQueryRequest request) {
return dataSourceAccessService.comprehensivePageQuery(userDataSourcesAdminConverter.request2param(request),
DATA_SOURCE_ACCESS_SELECTOR)
.mapToWeb(userDataSourcesAdminConverter::dto2vo);

4
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserTeamAdminController.java
View File

@ -2,9 +2,9 @@
package ai.chat2db.server.admin.api.controller.user;
import ai.chat2db.server.admin.api.controller.user.converter.UserTeamAdminConverter;
import ai.chat2db.server.admin.api.controller.user.request.UserTeamPageCommonQueryRequest;
import ai.chat2db.server.admin.api.controller.user.request.UserTeamBatchCreateRequest;
import ai.chat2db.server.admin.api.controller.user.vo.UserTeamPageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.param.team.user.TeamUserCreatParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserSelector;
import ai.chat2db.server.domain.api.service.TeamUserService;
@ -44,7 +44,7 @@ public class UserTeamAdminController {
* @version 2.1.0
*/
@GetMapping("/page")
public WebPageResult<UserTeamPageQueryVO> page(@Valid CommonPageQueryRequest request) {
public WebPageResult<UserTeamPageQueryVO> page(@Valid UserTeamPageCommonQueryRequest request) {
return teamUserService.comprehensivePageQuery(userTeamAdminConverter.request2param(request), TEAM_USER_SELECTOR)
.mapToWeb(userTeamAdminConverter::dto2vo);
}

9
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/UserDataSourcesAdminConverter.java
View File

@ -1,8 +1,9 @@
package ai.chat2db.server.admin.api.controller.user.converter;
import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceAccessBatchCreateRequest;
import ai.chat2db.server.admin.api.controller.user.request.UserTeamPageCommonQueryRequest;
import ai.chat2db.server.admin.api.controller.user.vo.UserDataSourcePageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.enums.AccessObjectTypeEnum;
import ai.chat2db.server.domain.api.enums.DataSourceKindEnum;
import ai.chat2db.server.domain.api.model.DataSourceAccess;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessBatchCreatParam;
@ -16,7 +17,7 @@ import org.mapstruct.Mappings;
*
* @author Jiaju Zhuang
*/
@Mapper(componentModel = "spring", imports = {DataSourceKindEnum.class})
@Mapper(componentModel = "spring", imports = {DataSourceKindEnum.class, AccessObjectTypeEnum.class})
public abstract class UserDataSourcesAdminConverter {
/**
@ -26,10 +27,12 @@ public abstract class UserDataSourcesAdminConverter {
* @return
*/
@Mappings({
@Mapping(source = "userId", target = "accessObjectId"),
@Mapping(target = "accessObjectType", expression = "java(AccessObjectTypeEnum.USER.name())"),
@Mapping(source = "searchKey", target = "userOrTeamSearchKey"),
@Mapping(target = "enableReturnCount", expression = "java(true)"),
})
public abstract DataSourceAccessComprehensivePageQueryParam request2param(CommonPageQueryRequest request);
public abstract DataSourceAccessComprehensivePageQueryParam request2param(UserTeamPageCommonQueryRequest request);
/**
* convert

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

@ -1,7 +1,7 @@
package ai.chat2db.server.admin.api.controller.user.converter;
import ai.chat2db.server.admin.api.controller.user.request.UserTeamPageCommonQueryRequest;
import ai.chat2db.server.admin.api.controller.user.vo.UserTeamPageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.model.TeamUser;
import ai.chat2db.server.domain.api.param.team.user.TeamUserComprehensivePageQueryParam;
import org.mapstruct.Mapper;
@ -26,7 +26,7 @@ public abstract class UserTeamAdminConverter {
@Mapping(source = "searchKey", target = "teamSearchKey"),
@Mapping(target = "enableReturnCount", expression = "java(true)"),
})
public abstract TeamUserComprehensivePageQueryParam request2param(CommonPageQueryRequest request);
public abstract TeamUserComprehensivePageQueryParam request2param(UserTeamPageCommonQueryRequest request);
/**
* conversion

25
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/request/UserTeamPageCommonQueryRequest.java Normal file
View File

@ -0,0 +1,25 @@
package ai.chat2db.server.admin.api.controller.user.request;
import ai.chat2db.server.tools.base.wrapper.request.PageQueryRequest;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* Pagination query
*
* @author Jiaju Zhuang
*/
@Data
public class UserTeamPageCommonQueryRequest extends PageQueryRequest {
/**
* user id
*/
@NotNull
private Long userId;
/**
* searchKey
*/
private String searchKey;
}