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

Complete the datasource code

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-08-05 21:22:28 +08:00
parent ab4801d97b
commit c09ee3156e
37 changed files with 176 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class DataSourceAdminController {
*/
@GetMapping("/page")
public WebPageResult<DataSourcePageQueryVO> page(@Valid CommonPageQueryRequest request) {
return dataSourceService.queryPage(dataSourceAdminConverter.request2param(request), null)
return dataSourceService.queryPageWithPermission(dataSourceAdminConverter.request2param(request), null)
.mapToWeb(dataSourceAdminConverter::dto2vo);
}
@ -81,6 +81,7 @@ public class DataSourceAdminController {
*
* @param request
* @return
* @version 2.1.0
*/
@PostMapping("/clone")
public DataResult<Long> clone(@RequestBody DataSourceCloneRequest request) {
@ -92,6 +93,7 @@ public class DataSourceAdminController {
*
* @param id
* @return
* @version 2.1.0
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {

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

@ -2,7 +2,7 @@
package ai.chat2db.server.admin.api.controller.user;
import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest;
import ai.chat2db.server.admin.api.controller.user.converter.DataSourceAdminConverter;
import ai.chat2db.server.admin.api.controller.user.converter.UserAdminConverter;
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;
@ -32,7 +32,7 @@ public class UserAdminController {
@Resource
private DataSourceService dataSourceService;
@Resource
private DataSourceAdminConverter dataSourceAdminConverter;
private UserAdminConverter dataSourceAdminConverter;
/**
* Pagination query

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

@ -1,66 +0,0 @@
package ai.chat2db.server.admin.api.controller.user.converter;
import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest;
import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceUpdateRequest;
import ai.chat2db.server.admin.api.controller.user.request.UserCreateRequest;
import ai.chat2db.server.domain.api.param.DataSourceCreateParam;
import ai.chat2db.server.domain.api.param.DataSourcePageQueryParam;
import ai.chat2db.server.domain.api.param.DataSourceUpdateParam;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
/**
* converter
*
* @author Jiaju Zhuang
*/
@Mapper(componentModel = "spring")
public abstract class DataSourceAdminConverter {
/**
* conversion
*
* @param request
* @return
*/
public abstract DataSourcePageQueryParam request2param(CommonPageQueryRequest request);
/**
* conversion
*
* @param request
* @return
*/
public abstract DataSourcePageQueryParam request2paramAccess(CommonPageQueryRequest request);
///**
// * conversion
// *
// * @param dto
// * @return
// */
//public abstract DataSourcePageQueryVO dto2vo(DataSource dto);
/**
* 参数转换
*
* @param request
* @return
*/
@Mappings({
@Mapping(source = "user", target = "userName")
})
public abstract DataSourceCreateParam createReq2param(UserCreateRequest request);
/**
* 参数转换
*
* @param request
* @return
*/
@Mappings({
@Mapping(source = "user", target = "userName")
})
public abstract DataSourceUpdateParam updateReq2param(DataSourceUpdateRequest request);
}

58
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/converter/UserAdminConverter.java Normal file
View File

@ -0,0 +1,58 @@
package ai.chat2db.server.admin.api.controller.user.converter;
import org.mapstruct.Mapper;
/**
* converter
*
* @author Jiaju Zhuang
*/
@Mapper(componentModel = "spring")
public abstract class UserAdminConverter {
///**
// * conversion
// *
// * @param request
// * @return
// */
//public abstract DataSourcePageQueryParam request2param(CommonPageQueryRequest request);
//
///**
// * conversion
// *
// * @param request
// * @return
// */
//public abstract DataSourcePageQueryParam request2paramAccess(CommonPageQueryRequest request);
///**
// * conversion
// *
// * @param dto
// * @return
// */
//public abstract DataSourcePageQueryVO dto2vo(DataSource dto);
//
///**
// * 参数转换
// *
// * @param request
// * @return
// */
//@Mappings({
// @Mapping(source = "user", target = "userName")
//})
//public abstract DataSourceCreateParam createReq2param(UserCreateRequest request);
//
///**
// * 参数转换
// *
// * @param request
// * @return
// */
//@Mappings({
// @Mapping(source = "user", target = "userName")
//})
//public abstract DataSourceUpdateParam updateReq2param(DataSourceUpdateRequest request);
}