diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceService.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceService.java index 87cc90be..ca7c23de 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceService.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceService.java @@ -39,7 +39,7 @@ public interface DataSourceService { * @param param * @return */ - ActionResult updateWithPermission(DataSourceUpdateParam param); + DataResult updateWithPermission(DataSourceUpdateParam param); /** * 删除数据源连接 diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java index 97e505a7..ef08f680 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java @@ -115,14 +115,14 @@ public class DataSourceServiceImpl implements DataSourceService { } @Override - public ActionResult updateWithPermission(DataSourceUpdateParam param) { + public DataResult updateWithPermission(DataSourceUpdateParam param) { DataSource dataSource = queryExistent(param.getId()).getData(); PermissionUtils.checkOperationPermission(dataSource.getUserId()); DataSourceDO dataSourceDO = dataSourceConverter.param2do(param); dataSourceDO.setGmtModified(DateUtil.date()); dataSourceMapper.updateById(dataSourceDO); - return ActionResult.isSuccess(); + return DataResult.of(dataSourceDO.getId()); } @Override diff --git a/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/result/ActionResult.java b/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/result/ActionResult.java index 269d2974..1dae8adc 100644 --- a/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/result/ActionResult.java +++ b/chat2db-server/chat2db-server-tools/chat2db-server-tools-base/src/main/java/ai/chat2db/server/tools/base/wrapper/result/ActionResult.java @@ -134,4 +134,16 @@ public class ActionResult implements Serializable, Result { return result; } + public DataResult toBooleaSuccessnDataResult() { + return DataResult.builder() + .success(success) + .errorCode(errorCode) + .errorMessage(errorMessage) + .errorDetail(errorDetail) + .solutionLink(solutionLink) + .traceId(traceId) + .data(Boolean.TRUE) + .build(); + } + } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAccessAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAccessAdminController.java index f23df0c2..1e9c6669 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAccessAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAccessAdminController.java @@ -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 delete(@PathVariable Long id) { + return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java index cf15f832..f12c30c7 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAdminController.java @@ -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 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 delete(@PathVariable Long id) { + return dataSourceService.deleteWithPermission(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamAdminController.java index 47c09672..7704b87e 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamAdminController.java @@ -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 delete(@PathVariable Long id) { + return teamService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamDataSourceAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamDataSourceAdminController.java index b3f18576..87e538d5 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamDataSourceAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamDataSourceAdminController.java @@ -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 delete(@PathVariable Long id) { + return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamUserAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamUserAdminController.java index 2b448724..5ace6086 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamUserAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamUserAdminController.java @@ -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 delete(@PathVariable Long id) { + return teamUserService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java index ced4ebaa..5fd7d4c1 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserAdminController.java @@ -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 delete(@PathVariable Long id) { + return userService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserDataSourceAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserDataSourceAdminController.java index abc94936..33842bcb 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserDataSourceAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserDataSourceAdminController.java @@ -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 delete(@PathVariable Long id) { + return dataSourceAccessService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserTeamAdminController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserTeamAdminController.java index 28c79e48..ad119322 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserTeamAdminController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/UserTeamAdminController.java @@ -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 delete(@PathVariable Long id) { + return teamUserService.delete(id).toBooleaSuccessnDataResult(); } } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java index 19efc5c8..ff049056 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java @@ -208,7 +208,7 @@ public class DataSourceController { * @return */ @RequestMapping(value = "/datasource/update",method = {RequestMethod.POST, RequestMethod.PUT}) - public ActionResult update(@RequestBody DataSourceUpdateRequest request) { + public DataResult update(@RequestBody DataSourceUpdateRequest request) { DataSourceUpdateParam param = dataSourceWebConverter.updateReq2param(request); return dataSourceService.updateWithPermission(param); }