Team Create Complete Fields

This commit is contained in:
JiaJu Zhuang
2023-08-26 14:00:39 +08:00
parent 0198cd6b64
commit 6e53cf7aba
21 changed files with 152 additions and 51 deletions

View File

@ -6,6 +6,7 @@ import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.admin.api.controller.team.request.TeamCreateRequest;
import ai.chat2db.server.admin.api.controller.team.request.TeamUpdateRequest;
import ai.chat2db.server.admin.api.controller.team.vo.TeamPageQueryVO;
import ai.chat2db.server.domain.api.param.team.TeamSelector;
import ai.chat2db.server.domain.api.service.TeamService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
@ -28,6 +29,10 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/admin/team")
@RestController
public class TeamAdminController {
private static final TeamSelector TEAM_SELECTOR=TeamSelector.builder()
.modifiedUser(Boolean.TRUE)
.build();
@Resource
private TeamService teamService;
@Resource
@ -42,7 +47,7 @@ public class TeamAdminController {
*/
@GetMapping("/page")
public WebPageResult<TeamPageQueryVO> page(@Valid CommonPageQueryRequest request) {
return teamService.pageQuery(teamAdminConverter.request2param(request), null)
return teamService.pageQuery(teamAdminConverter.request2param(request), TEAM_SELECTOR)
.mapToWeb(teamAdminConverter::dto2vo);
}

View File

@ -31,14 +31,6 @@ public class TeamCreateRequest {
@NotNull
private String status;
/**
* 角色编码
*
* @see ai.chat2db.server.domain.api.enums.RoleCodeEnum
*/
@NotNull
private String roleCode;
/**
* 团队描述
*/

View File

@ -1,6 +1,9 @@
package ai.chat2db.server.admin.api.controller.team.vo;
import java.util.Date;
import ai.chat2db.server.common.api.controller.vo.SimpleUserVO;
import lombok.Data;
/**
@ -25,11 +28,30 @@ public class TeamPageQueryVO {
*/
private String name;
/**
* 团队状态
*
* @see ai.chat2db.server.domain.api.enums.ValidStatusEnum
*/
private String status;
/**
* 团队描述
*/
private String description;
/**
* 修改时间
*/
private Date gmtModified;
/**
* 修改人用户id
*/
private Long modifiedUserId;
/**
* 修改人用户
*/
private SimpleUserVO modifiedUser;
}