Skip to content

Commit be87d9e

Browse files
chat2db-jerrychat2db-jerry
committed
Complete interface definition
1 parent a090565 commit be87d9e

31 files changed

Lines changed: 680 additions & 320 deletions

‎chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Team.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.io.Serializable;
55

66
import ai.chat2db.server.tools.base.constant.EasyToolsConstant;
7+
import jakarta.validation.constraints.NotNull;
78
import lombok.AllArgsConstructor;
89
import lombok.Data;
910
import lombok.NoArgsConstructor;
@@ -26,23 +27,32 @@ public class Team implements Serializable {
2627
/**
2728
* 主键
2829
*/
30+
@NotNull
2931
private Long id;
3032

3133
/**
3234
* 团队编码
3335
*/
36+
@NotNull
3437
private String code;
3538

3639
/**
3740
* 团队名称
3841
*/
42+
@NotNull
3943
private String name;
4044

4145
/**
4246
* 团队状态
4347
*
4448
* @see ai.chat2db.server.domain.api.enums.ValidStatusEnum
4549
*/
50+
@NotNull
4651
private String status;
4752

53+
/**
54+
* 团队描述
55+
*/
56+
private String description;
57+
4858
}

chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/TeamDbhubUserDO.java renamed to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/TeamUserDO.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package ai.chat2db.server.domain.repository.entity;
22

3+
import java.io.Serializable;
4+
import java.time.LocalDateTime;
5+
36
import com.baomidou.mybatisplus.annotation.IdType;
47
import com.baomidou.mybatisplus.annotation.TableId;
58
import com.baomidou.mybatisplus.annotation.TableName;
6-
import java.io.Serializable;
7-
import java.time.LocalDateTime;
89
import lombok.Getter;
910
import lombok.Setter;
1011

@@ -14,12 +15,12 @@
1415
* </p>
1516
*
1617
* @author chat2db
17-
* @since 2023-07-30
18+
* @since 2023-08-05
1819
*/
1920
@Getter
2021
@Setter
21-
@TableName("TEAM_DBHUB_USER")
22-
public class TeamDbhubUserDO implements Serializable {
22+
@TableName("TEAM_USER")
23+
public class TeamUserDO implements Serializable {
2324

2425
private static final long serialVersionUID = 1L;
2526

@@ -57,5 +58,5 @@ public class TeamDbhubUserDO implements Serializable {
5758
/**
5859
* 用户id
5960
*/
60-
private Long dbhubUserId;
61+
private Long userId;
6162
}

chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/TeamDbhubUserMapper.java renamed to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/TeamUserMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ai.chat2db.server.domain.repository.mapper;
22

3-
import ai.chat2db.server.domain.repository.entity.TeamDbhubUserDO;
3+
import ai.chat2db.server.domain.repository.entity.TeamUserDO;
44
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
55

66
/**
@@ -9,8 +9,8 @@
99
* </p>
1010
*
1111
* @author chat2db
12-
* @since 2023-07-30
12+
* @since 2023-08-05
1313
*/
14-
public interface TeamDbhubUserMapper extends BaseMapper<TeamDbhubUserDO> {
14+
public interface TeamUserMapper extends BaseMapper<TeamUserDO> {
1515

1616
}

chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamDbhubUserMapper.xml renamed to chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/ai/chat2db/server/domain/repository/TeamUserMapper.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3-
<mapper namespace="ai.chat2db.server.domain.repository.mapper.TeamDbhubUserMapper">
3+
<mapper namespace="ai.chat2db.server.domain.repository.mapper.TeamUserMapper">
44

55
</mapper>

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceAccessController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* @author Jiaju Zhuang
2525
*/
26-
@RequestMapping("/api/admin/data/source/access")
26+
@RequestMapping("/api/admin/data_source/access")
2727
@RestController
2828
public class DataSourceAccessController {
2929

@@ -51,7 +51,7 @@ public WebPageResult<DataSourceAccessPageQueryVO> page(@Valid DataSourceAccessPa
5151
* @return
5252
* @version 2.1.0
5353
*/
54-
@PostMapping("/batch-create")
54+
@PostMapping("/batch_create")
5555
public ActionResult batchCreate(@RequestBody DataSourceAccessBatchCreateRequest request) {
5656
return null;
5757
}

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/DataSourceController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
* @author Jiaju Zhuang
3030
*/
31-
@RequestMapping("/api/admin/data/source")
31+
@RequestMapping("/api/admin/data_source")
3232
@RestController
3333
public class DataSourceController {
3434

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/vo/SimpleDataSourceVO.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
package ai.chat2db.server.admin.api.controller.datasource.vo;
3+
4+
import ai.chat2db.server.common.api.controller.vo.EnvironmentVO;
5+
import lombok.Data;
6+
7+
/**
8+
* Data Source
9+
*
10+
* @author Jiaju Zhuang
11+
*/
12+
@Data
13+
public class SimpleDataSourceVO {
14+
15+
/**
16+
* 主键id
17+
*/
18+
private Long id;
19+
20+
/**
21+
* 连接别名
22+
*/
23+
private String alias;
24+
25+
/**
26+
* 连接地址
27+
*/
28+
private String url;
29+
30+
/**
31+
* 环境id
32+
*/
33+
private Long environmentId;
34+
35+
/**
36+
* 环境
37+
*/
38+
private EnvironmentVO environment;
39+
}

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamController.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
package ai.chat2db.server.admin.api.controller.team;
3+
4+
import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest;
5+
import ai.chat2db.server.admin.api.controller.team.request.TeamCreateRequest;
6+
import ai.chat2db.server.admin.api.controller.team.request.TeamUpdateRequest;
7+
import ai.chat2db.server.admin.api.controller.team.vo.TeamPageQueryVO;
8+
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
9+
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
10+
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
11+
import jakarta.validation.Valid;
12+
import org.springframework.web.bind.annotation.DeleteMapping;
13+
import org.springframework.web.bind.annotation.GetMapping;
14+
import org.springframework.web.bind.annotation.PathVariable;
15+
import org.springframework.web.bind.annotation.PostMapping;
16+
import org.springframework.web.bind.annotation.RequestBody;
17+
import org.springframework.web.bind.annotation.RequestMapping;
18+
import org.springframework.web.bind.annotation.RestController;
19+
20+
/**
21+
* Team Management
22+
*
23+
* @author Jiaju Zhuang
24+
*/
25+
@RequestMapping("/api/admin/team")
26+
@RestController
27+
public class TeamController {
28+
29+
/**
30+
* Pagination query
31+
*
32+
* @param request
33+
* @return
34+
* @version 2.1.0
35+
*/
36+
@GetMapping("/page")
37+
public WebPageResult<TeamPageQueryVO> page(@Valid CommonPageQueryRequest request) {
38+
return null;
39+
}
40+
41+
/**
42+
* create
43+
*
44+
* @param request
45+
* @return
46+
* @version 2.1.0
47+
*/
48+
@PostMapping("/create")
49+
public DataResult<Long> create(@RequestBody TeamCreateRequest request) {
50+
return null;
51+
52+
}
53+
54+
/**
55+
* update
56+
*
57+
* @param request
58+
* @return
59+
* @version 2.1.0
60+
*/
61+
@PostMapping("/update")
62+
public ActionResult update(@RequestBody TeamUpdateRequest request) {
63+
return null;
64+
}
65+
66+
/**
67+
* delete
68+
*
69+
* @param id
70+
* @return
71+
*/
72+
@DeleteMapping("/{id}")
73+
public ActionResult delete(@PathVariable Long id) {
74+
return null;
75+
}
76+
}

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamDataSourceController.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
2+
package ai.chat2db.server.admin.api.controller.team;
3+
4+
import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest;
5+
import ai.chat2db.server.admin.api.controller.team.request.TeamDataSourceBatchCreateRequest;
6+
import ai.chat2db.server.admin.api.controller.team.vo.TeamDataSourcePageQueryVO;
7+
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
8+
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
9+
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
10+
import jakarta.validation.Valid;
11+
import org.springframework.web.bind.annotation.DeleteMapping;
12+
import org.springframework.web.bind.annotation.GetMapping;
13+
import org.springframework.web.bind.annotation.PathVariable;
14+
import org.springframework.web.bind.annotation.PostMapping;
15+
import org.springframework.web.bind.annotation.RequestBody;
16+
import org.springframework.web.bind.annotation.RequestMapping;
17+
import org.springframework.web.bind.annotation.RestController;
18+
19+
/**
20+
* Team Data Source Management
21+
*
22+
* @author Jiaju Zhuang
23+
*/
24+
@RequestMapping("/api/admin/team/data_source")
25+
@RestController
26+
public class TeamDataSourceController {
27+
28+
/**
29+
* Pagination query
30+
*
31+
* @param request
32+
* @return
33+
* @version 2.1.0
34+
*/
35+
@GetMapping("/page")
36+
public WebPageResult<TeamDataSourcePageQueryVO> page(@Valid CommonPageQueryRequest request) {
37+
return null;
38+
}
39+
40+
/**
41+
* create
42+
*
43+
* @param request
44+
* @return
45+
* @version 2.1.0
46+
*/
47+
@PostMapping("/batch_create")
48+
public DataResult<Long> create(@RequestBody TeamDataSourceBatchCreateRequest request) {
49+
return null;
50+
51+
}
52+
53+
/**
54+
* delete
55+
*
56+
* @param id
57+
* @return
58+
*/
59+
@DeleteMapping("/{id}")
60+
public ActionResult delete(@PathVariable Long id) {
61+
return null;
62+
}
63+
}

‎chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/team/TeamUserController.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
2+
package ai.chat2db.server.admin.api.controller.team;
3+
4+
import ai.chat2db.server.admin.api.controller.common.request.CommonPageQueryRequest;
5+
import ai.chat2db.server.admin.api.controller.team.request.TeamUserBatchCreateRequest;
6+
import ai.chat2db.server.admin.api.controller.team.vo.TeamUserPageQueryVO;
7+
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
8+
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
9+
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
10+
import jakarta.validation.Valid;
11+
import org.springframework.web.bind.annotation.DeleteMapping;
12+
import org.springframework.web.bind.annotation.GetMapping;
13+
import org.springframework.web.bind.annotation.PathVariable;
14+
import org.springframework.web.bind.annotation.PostMapping;
15+
import org.springframework.web.bind.annotation.RequestBody;
16+
import org.springframework.web.bind.annotation.RequestMapping;
17+
import org.springframework.web.bind.annotation.RestController;
18+
19+
/**
20+
* Team User Management
21+
*
22+
* @author Jiaju Zhuang
23+
*/
24+
@RequestMapping("/api/admin/team/user")
25+
@RestController
26+
public class TeamUserController {
27+
28+
/**
29+
* Pagination query
30+
*
31+
* @param request
32+
* @return
33+
* @version 2.1.0
34+
*/
35+
@GetMapping("/page")
36+
public WebPageResult<TeamUserPageQueryVO> page(@Valid CommonPageQueryRequest request) {
37+
return null;
38+
}
39+
40+
/**
41+
* create
42+
*
43+
* @param request
44+
* @return
45+
* @version 2.1.0
46+
*/
47+
@PostMapping("/batch_create")
48+
public DataResult<Long> create(@RequestBody TeamUserBatchCreateRequest request) {
49+
return null;
50+
51+
}
52+
53+
/**
54+
* delete
55+
*
56+
* @param id
57+
* @return
58+
*/
59+
@DeleteMapping("/{id}")
60+
public ActionResult delete(@PathVariable Long id) {
61+
return null;
62+
}
63+
}

0 commit comments

Comments
 (0)