Team Create Complete Fields

This commit is contained in:
JiaJu Zhuang
2023-08-26 14:27:43 +08:00
parent b00d6856b0
commit bc8f5a2a8e
12 changed files with 40 additions and 26 deletions

View File

@ -9,6 +9,7 @@ import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessCrea
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
import ai.chat2db.server.domain.api.service.DataSourceAccessService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -77,8 +78,8 @@ public class DataSourceAccessAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -1,17 +1,16 @@
package ai.chat2db.server.admin.api.controller.datasource;
import ai.chat2db.server.common.api.controller.request.CommonPageQueryRequest;
import ai.chat2db.server.admin.api.controller.datasource.converter.DataSourceAdminConverter;
import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceCloneRequest;
import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceCreateRequest;
import ai.chat2db.server.admin.api.controller.datasource.request.DataSourceUpdateRequest;
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.DataSourceSelector;
import ai.chat2db.server.domain.api.param.datasource.DataSourceUpdateParam;
import ai.chat2db.server.domain.api.service.DataSourceService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
@ -75,7 +74,7 @@ public class DataSourceAdminController {
* @version 2.1.0
*/
@PostMapping("/update")
public ActionResult update(@Valid @RequestBody DataSourceUpdateRequest request) {
public DataResult<Long> update(@Valid @RequestBody DataSourceUpdateRequest request) {
DataSourceUpdateParam param = dataSourceAdminConverter.updateReq2param(request);
return dataSourceService.updateWithPermission(param);
}
@ -100,7 +99,7 @@ public class DataSourceAdminController {
* @version 2.1.0
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return dataSourceService.deleteWithPermission(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return dataSourceService.deleteWithPermission(id).toBooleaSuccessnDataResult();
}
}

View File

@ -2,13 +2,12 @@
package ai.chat2db.server.admin.api.controller.team;
import ai.chat2db.server.admin.api.controller.team.converter.TeamAdminConverter;
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.common.api.controller.request.CommonPageQueryRequest;
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;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
@ -82,7 +81,7 @@ public class TeamAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return teamService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return teamService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -12,6 +12,7 @@ import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessPage
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
import ai.chat2db.server.domain.api.service.DataSourceAccessService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -92,7 +93,7 @@ public class TeamDataSourceAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -10,6 +10,7 @@ import ai.chat2db.server.domain.api.param.team.user.TeamUserPageQueryParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserSelector;
import ai.chat2db.server.domain.api.service.TeamUserService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -84,7 +85,7 @@ public class TeamUserAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return teamUserService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return teamUserService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -8,7 +8,6 @@ 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.user.UserSelector;
import ai.chat2db.server.domain.api.service.UserService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
@ -83,7 +82,7 @@ public class UserAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return userService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return userService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -12,6 +12,7 @@ import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessPage
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
import ai.chat2db.server.domain.api.service.DataSourceAccessService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -92,7 +93,7 @@ public class UserDataSourceAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult();
}
}

View File

@ -10,6 +10,7 @@ import ai.chat2db.server.domain.api.param.team.user.TeamUserPageQueryParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserSelector;
import ai.chat2db.server.domain.api.service.TeamUserService;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -83,7 +84,7 @@ public class UserTeamAdminController {
* @return
*/
@DeleteMapping("/{id}")
public ActionResult delete(@PathVariable Long id) {
return teamUserService.delete(id);
public DataResult<Boolean> delete(@PathVariable Long id) {
return teamUserService.delete(id).toBooleaSuccessnDataResult();
}
}