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

Add order by

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-08-26 20:46:29 +08:00
parent fd76f4f75c
commit 93a1c12777
14 changed files with 154 additions and 10 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/datasource/DataSourceAdminController.java
View File

@ -8,6 +8,8 @@ import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceUpdat
import ai.chat2db.server.admin.api.controller.datasource.vo.DataSourcePageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.param.datasource.DataSourceCreateParam;
import ai.chat2db.server.domain.api.param.datasource.DataSourcePageQueryParam;
import ai.chat2db.server.domain.api.param.datasource.DataSourcePageQueryParam.OrderCondition;
import ai.chat2db.server.domain.api.param.datasource.DataSourceSelector;
import ai.chat2db.server.domain.api.param.datasource.DataSourceUpdateParam;
import ai.chat2db.server.domain.api.service.DataSourceService;
@ -49,7 +51,9 @@ public class DataSourceAdminController {
*/
@GetMapping("/page")
public WebPageResult<DataSourcePageQueryVO> page(@Valid CommonPageQueryRequest request) {
return dataSourceService.queryPageWithPermission(dataSourceAdminConverter.request2param(request), DATA_SOURCE_SELECTOR)
DataSourcePageQueryParam param = dataSourceAdminConverter.request2param(request);
param.orderBy(OrderCondition.ID_DESC);
return dataSourceService.queryPageWithPermission(param, DATA_SOURCE_SELECTOR)
.mapToWeb(dataSourceAdminConverter::dto2vo);
}

8
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamAdminController.java
View File

@ -6,6 +6,8 @@ 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.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.param.team.TeamPageQueryParam;
import ai.chat2db.server.domain.api.param.team.TeamPageQueryParam.OrderCondition;
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.DataResult;
@ -28,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/admin/team")
@RestController
public class TeamAdminController {
private static final TeamSelector TEAM_SELECTOR=TeamSelector.builder()
private static final TeamSelector TEAM_SELECTOR = TeamSelector.builder()
.modifiedUser(Boolean.TRUE)
.build();
@ -46,7 +48,9 @@ public class TeamAdminController {
*/
@GetMapping("/page")
public WebPageResult<TeamPageQueryVO> page(@Valid CommonPageQueryRequest request) {
return teamService.pageQuery(teamAdminConverter.request2param(request), TEAM_SELECTOR)
TeamPageQueryParam param = teamAdminConverter.request2param(request);
param.orderBy(OrderCondition.ID_DESC);
return teamService.pageQuery(param, TEAM_SELECTOR)
.mapToWeb(teamAdminConverter::dto2vo);
}

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

@ -6,6 +6,8 @@ import ai.chat2db.server.admin.api.controller.user.request.UserCreateRequest;
import ai.chat2db.server.admin.api.controller.user.request.UserUpdateRequest;
import ai.chat2db.server.admin.api.controller.user.vo.UserPageQueryVO;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.domain.api.param.team.TeamPageQueryParam.OrderCondition;
import ai.chat2db.server.domain.api.param.user.UserPageQueryParam;
import ai.chat2db.server.domain.api.param.user.UserSelector;
import ai.chat2db.server.domain.api.service.UserService;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
@ -29,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class UserAdminController {
private static final UserSelector USER_SELECTOR= UserSelector.builder()
private static final UserSelector USER_SELECTOR = UserSelector.builder()
.modifiedUser(Boolean.TRUE)
.build();
@ -47,7 +49,9 @@ public class UserAdminController {
*/
@GetMapping("/page")
public WebPageResult<UserPageQueryVO> page(@Valid CommonPageQueryRequest request) {
return userService.pageQuery(userAdminConverter.request2param(request), USER_SELECTOR)
UserPageQueryParam param = userAdminConverter.request2param(request);
param.orderBy(OrderCondition.ID_DESC);
return userService.pageQuery(param, USER_SELECTOR)
.mapToWeb(userAdminConverter::dto2vo);
}