From 0dfc9a7f66ed82e62478d740bb5b1aeffeacb941 Mon Sep 17 00:00:00 2001 From: JiaJu Zhuang <5152853@qq.com> Date: Sat, 5 Aug 2023 14:17:35 +0800 Subject: [PATCH] Modify some team codes --- .../chat2db/server/domain/api/model/Team.java | 48 +++++++++++++ .../V2_1_0__支持环境、用户权限.sql | 8 +-- .../test/mybatis/MybatisGeneratorTest.java | 4 +- .../api/controller/team/vo/SimpleTeamVO.java | 37 ++++++++++ .../user/DataSourceAccessController.java | 70 ------------------- .../user/vo/UserTeamPageQueryVO.java | 35 ++++++++++ 6 files changed, 127 insertions(+), 75 deletions(-) create mode 100644 chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Team.java create mode 100644 chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/vo/SimpleTeamVO.java delete mode 100644 chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/DataSourceAccessController.java create mode 100644 chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/vo/UserTeamPageQueryVO.java diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Team.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Team.java new file mode 100644 index 00000000..c648cec9 --- /dev/null +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Team.java @@ -0,0 +1,48 @@ +package ai.chat2db.server.domain.api.model; + +import java.io.Serial; +import java.io.Serializable; + +import ai.chat2db.server.tools.base.constant.EasyToolsConstant; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * Team + * + * @author Jiaju Zhuang + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class Team implements Serializable { + + @Serial + private static final long serialVersionUID = EasyToolsConstant.SERIAL_VERSION_UID; + + /** + * 主键 + */ + private Long id; + + /** + * 团队编码 + */ + private String code; + + /** + * 团队名称 + */ + private String name; + + /** + * 团队状态 + * + * @see ai.chat2db.server.domain.api.enums.ValidStatusEnum + */ + private String status; + +} diff --git a/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql b/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql index 3fd674b1..3c8cda58 100644 --- a/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql +++ b/chat2db-server/chat2db-server-start/src/main/resources/db/migration/V2_1_0__支持环境、用户权限.sql @@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS `team` create UNIQUE INDEX uk_team_code on team (code); -CREATE TABLE IF NOT EXISTS `team_dbhub_user` +CREATE TABLE IF NOT EXISTS `team_user` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', @@ -61,14 +61,14 @@ CREATE TABLE IF NOT EXISTS `team_dbhub_user` `create_user_id` bigint(20) unsigned NOT NULL COMMENT '创建人用户id', `modified_user_id` bigint(20) unsigned NOT NULL COMMENT '修改人用户id', `team_id` bigint(20) unsigned NOT NULL COMMENT '团队id', - `dbhub_user_id` bigint(20) unsigned NOT NULL COMMENT '用户id', + `user_id` bigint(20) unsigned NOT NULL COMMENT '用户id', PRIMARY KEY (`id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='用户团队表' ; -create INDEX idx_team_dbhub_user_team_id on team_dbhub_user (`team_id`); -create INDEX idx_team_dbhub_user_dbhub_user_id on team_dbhub_user (`dbhub_user_id`); +create INDEX idx_team_user_team_id on team_user (`team_id`); +create INDEX idx_team_user_user_id on team_user (`user_id`); CREATE TABLE IF NOT EXISTS `data_source_access` ( diff --git a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java index d8b8be60..12ea9944 100644 --- a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java +++ b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java @@ -32,7 +32,9 @@ public class MybatisGeneratorTest extends BaseTest { //doGenerator(Lists.newArrayList("data_source")); //doGenerator(Lists.newArrayList("operation_log")); //doGenerator(Lists.newArrayList("operation_saved")); - doGenerator(Lists.newArrayList("environment","data_source","team","team_dbhub_user","data_source_access","dbhub_user")); + //doGenerator(Lists.newArrayList("environment","data_source","team","team_dbhub_user","data_source_access", + // "dbhub_user")); + doGenerator(Lists.newArrayList("team_user")); } private void doGenerator(List tableList) { diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/vo/SimpleTeamVO.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/vo/SimpleTeamVO.java new file mode 100644 index 00000000..f6b0bf5f --- /dev/null +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/vo/SimpleTeamVO.java @@ -0,0 +1,37 @@ + +package ai.chat2db.server.admin.api.controller.team.vo; + +import lombok.Data; + +/** + * team + * + * @author Jiaju Zhuang + */ +@Data +public class SimpleTeamVO { + + /** + * 主键 + */ + private Long id; + + /** + * 团队编码 + */ + private String code; + + /** + * 团队名称 + */ + private String name; + + + /** + * 团队状态 + * + * @see ai.chat2db.server.domain.api.enums.ValidStatusEnum + */ + private String status; + +} diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/DataSourceAccessController.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/DataSourceAccessController.java deleted file mode 100644 index 65233dab..00000000 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/DataSourceAccessController.java +++ /dev/null @@ -1,70 +0,0 @@ - -package ai.chat2db.server.admin.api.controller.user; - -import ai.chat2db.server.admin.api.controller.user.converter.DataSourceAdminConverter; -import ai.chat2db.server.admin.api.controller.user.request.DataSourceAccessBatchCreateRequest; -import ai.chat2db.server.admin.api.controller.user.request.DataSourceAccessPageQueryRequest; -import ai.chat2db.server.admin.api.controller.user.vo.DataSourceAccessPageQueryVO; -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.web.WebPageResult; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Data Source Access Management - * - * @author Jiaju Zhuang - */ -@RequestMapping("/api/admin/data/source/access") -@RestController -public class DataSourceAccessController { - - @Resource - private DataSourceService dataSourceService; - @Resource - private DataSourceAdminConverter dataSourceAdminConverter; - - /** - * Pagination query - * - * @param request - * @return - * @version 2.1.0 - */ - @GetMapping("/page") - public WebPageResult page(@Valid DataSourceAccessPageQueryRequest request) { - return null; - } - - /** - * batch - * - * @param request - * @return - * @version 2.1.0 - */ - @PostMapping("/batch-create") - public ActionResult batchCreate(@RequestBody DataSourceAccessBatchCreateRequest request) { - return null; - } - - /** - * delete - * - * @param id - * @return - */ - @DeleteMapping("/{id}") - public ActionResult delete(@PathVariable Long id) { - return null; - } - -} diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/vo/UserTeamPageQueryVO.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/vo/UserTeamPageQueryVO.java new file mode 100644 index 00000000..554985cf --- /dev/null +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/user/vo/UserTeamPageQueryVO.java @@ -0,0 +1,35 @@ + +package ai.chat2db.server.admin.api.controller.user.vo; + +import lombok.Data; + +/** + * Pagination query + * + * @author Jiaju Zhuang + */ +@Data +public class UserTeamPageQueryVO { + + /** + * user id + */ + private Long userId; + + /** + * 团队编码 + */ + private String code; + + /** + * 团队名称 + */ + private String name; + + /** + * 团队状态 + * + * @see ai.chat2db.server.domain.api.enums.ValidStatusEnum + */ + private String status; +}