This commit is contained in:
JiaJu Zhuang
2023-06-23 14:53:22 +08:00
parent 2b6ed839c8
commit 9b16a8843c
2 changed files with 19 additions and 20 deletions

View File

@ -41,6 +41,7 @@ import ai.chat2db.server.web.api.controller.rdb.vo.SqlVO;
import ai.chat2db.server.web.api.controller.rdb.vo.TableVO; import ai.chat2db.server.web.api.controller.rdb.vo.TableVO;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -79,7 +80,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/list")
public WebPageResult<TableVO> list(TableBriefQueryRequest request) { public WebPageResult<TableVO> list(@Valid TableBriefQueryRequest request) {
TablePageQueryParam queryParam = rdbWebConverter.tablePageRequest2param(request); TablePageQueryParam queryParam = rdbWebConverter.tablePageRequest2param(request);
TableSelector tableSelector = new TableSelector(); TableSelector tableSelector = new TableSelector();
tableSelector.setColumnList(false); tableSelector.setColumnList(false);
@ -98,7 +99,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/schema_list") @GetMapping("/schema_list")
public ListResult<SchemaVO> schemaList(DataSourceBaseRequest request) { public ListResult<SchemaVO> schemaList(@Valid DataSourceBaseRequest request) {
SchemaQueryParam queryParam = SchemaQueryParam.builder().dataBaseName(request.getDatabaseName()).build(); SchemaQueryParam queryParam = SchemaQueryParam.builder().dataBaseName(request.getDatabaseName()).build();
ListResult<Schema> tableColumns = databaseService.querySchema(queryParam); ListResult<Schema> tableColumns = databaseService.querySchema(queryParam);
List<SchemaVO> tableVOS = rdbWebConverter.schemaDto2vo(tableColumns.getData()); List<SchemaVO> tableVOS = rdbWebConverter.schemaDto2vo(tableColumns.getData());
@ -112,7 +113,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/delete_database") @PostMapping("/delete_database")
public ActionResult deleteDatabase(@RequestBody DataSourceBaseRequest request) { public ActionResult deleteDatabase(@Valid @RequestBody DataSourceBaseRequest request) {
DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName()).build(); DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName()).build();
return databaseService.deleteDatabase(param); return databaseService.deleteDatabase(param);
} }
@ -124,7 +125,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/create_database") @PostMapping("/create_database")
public ActionResult createDatabase(@RequestBody DataSourceBaseRequest request) { public ActionResult createDatabase(@Valid @RequestBody DataSourceBaseRequest request) {
DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName()).build(); DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName()).build();
return databaseService.createDatabase(param); return databaseService.createDatabase(param);
} }
@ -136,7 +137,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/modify_database") @PostMapping("/modify_database")
public ActionResult modifyDatabase(@RequestBody UpdateDatabaseRequest request) { public ActionResult modifyDatabase(@Valid @RequestBody UpdateDatabaseRequest request) {
DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName()) DatabaseOperationParam param = DatabaseOperationParam.builder().databaseName(request.getDatabaseName())
.newDatabaseName(request.getNewDatabaseName()).build(); .newDatabaseName(request.getNewDatabaseName()).build();
return databaseService.modifyDatabase(param); return databaseService.modifyDatabase(param);
@ -149,7 +150,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/delete_schema") @PostMapping("/delete_schema")
public ActionResult deleteSchema(@RequestBody DataSourceBaseRequest request) { public ActionResult deleteSchema(@Valid @RequestBody DataSourceBaseRequest request) {
SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName()) SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName())
.schemaName(request.getSchemaName()).build(); .schemaName(request.getSchemaName()).build();
return databaseService.deleteSchema(param); return databaseService.deleteSchema(param);
@ -162,7 +163,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/create_schema") @PostMapping("/create_schema")
public ActionResult createSchema(@RequestBody DataSourceBaseRequest request) { public ActionResult createSchema(@Valid @RequestBody DataSourceBaseRequest request) {
SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName()) SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName())
.schemaName(request.getSchemaName()).build(); .schemaName(request.getSchemaName()).build();
return databaseService.createSchema(param); return databaseService.createSchema(param);
@ -175,7 +176,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/modify_schema") @PostMapping("/modify_schema")
public ActionResult modifySchema(@RequestBody UpdateSchemaRequest request) { public ActionResult modifySchema(@Valid @RequestBody UpdateSchemaRequest request) {
SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName()) SchemaOperationParam param = SchemaOperationParam.builder().databaseName(request.getDatabaseName())
.schemaName(request.getSchemaName()).newSchemaName(request.getNewSchemaName()).build(); .schemaName(request.getSchemaName()).newSchemaName(request.getNewSchemaName()).build();
return databaseService.modifySchema(param); return databaseService.modifySchema(param);
@ -189,7 +190,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/column_list") @GetMapping("/column_list")
public ListResult<ColumnVO> columnList(TableDetailQueryRequest request) { public ListResult<ColumnVO> columnList(@Valid TableDetailQueryRequest request) {
TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request); TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request);
List<TableColumn> tableColumns = tableService.queryColumns(queryParam); List<TableColumn> tableColumns = tableService.queryColumns(queryParam);
List<ColumnVO> tableVOS = rdbWebConverter.columnDto2vo(tableColumns); List<ColumnVO> tableVOS = rdbWebConverter.columnDto2vo(tableColumns);
@ -203,7 +204,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/index_list") @GetMapping("/index_list")
public ListResult<IndexVO> indexList(TableDetailQueryRequest request) { public ListResult<IndexVO> indexList(@Valid TableDetailQueryRequest request) {
TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request); TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request);
List<TableIndex> tableIndices = tableService.queryIndexes(queryParam); List<TableIndex> tableIndices = tableService.queryIndexes(queryParam);
List<IndexVO> indexVOS = rdbWebConverter.indexDto2vo(tableIndices); List<IndexVO> indexVOS = rdbWebConverter.indexDto2vo(tableIndices);
@ -217,7 +218,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/key_list") @GetMapping("/key_list")
public ListResult<IndexVO> keyList(TableDetailQueryRequest request) { public ListResult<IndexVO> keyList(@Valid TableDetailQueryRequest request) {
// TODO 增加查询key实现 // TODO 增加查询key实现
return ListResult.of(Lists.newArrayList()); return ListResult.of(Lists.newArrayList());
} }
@ -229,7 +230,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/export") @GetMapping("/export")
public DataResult<String> export(DdlExportRequest request) { public DataResult<String> export(@Valid DdlExportRequest request) {
ShowCreateTableParam param = rdbWebConverter.ddlExport2showCreate(request); ShowCreateTableParam param = rdbWebConverter.ddlExport2showCreate(request);
return tableService.showCreateTable(param); return tableService.showCreateTable(param);
} }
@ -241,7 +242,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/create/example") @GetMapping("/create/example")
public DataResult<String> createExample(TableCreateDdlQueryRequest request) { public DataResult<String> createExample(@Valid TableCreateDdlQueryRequest request) {
return tableService.createTableExample(request.getDbType()); return tableService.createTableExample(request.getDbType());
} }
@ -252,7 +253,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/update/example") @GetMapping("/update/example")
public DataResult<String> updateExample(TableUpdateDdlQueryRequest request) { public DataResult<String> updateExample(@Valid TableUpdateDdlQueryRequest request) {
return tableService.alterTableExample(request.getDbType()); return tableService.alterTableExample(request.getDbType());
} }
@ -263,7 +264,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/query") @GetMapping("/query")
public DataResult<TableVO> query(TableDetailQueryRequest request) { public DataResult<TableVO> query(@Valid TableDetailQueryRequest request) {
TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request); TableQueryParam queryParam = rdbWebConverter.tableRequest2param(request);
TableSelector tableSelector = new TableSelector(); TableSelector tableSelector = new TableSelector();
tableSelector.setColumnList(true); tableSelector.setColumnList(true);
@ -280,7 +281,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@GetMapping("/modify/sql") @GetMapping("/modify/sql")
public ListResult<SqlVO> modifySql(TableModifySqlRequest request) { public ListResult<SqlVO> modifySql(@Valid TableModifySqlRequest request) {
return tableService.buildSql( return tableService.buildSql(
rdbWebConverter.tableRequest2param(request.getOldTable()), rdbWebConverter.tableRequest2param(request.getOldTable()),
rdbWebConverter.tableRequest2param(request.getNewTable())) rdbWebConverter.tableRequest2param(request.getNewTable()))
@ -294,7 +295,7 @@ public class RdbDdlController {
* @return * @return
*/ */
@PostMapping("/delete") @PostMapping("/delete")
public ActionResult delete(@RequestBody TableDeleteRequest request) { public ActionResult delete(@Valid @RequestBody TableDeleteRequest request) {
DropParam dropParam = rdbWebConverter.tableDelete2dropParam(request); DropParam dropParam = rdbWebConverter.tableDelete2dropParam(request);
return tableService.drop(dropParam); return tableService.drop(dropParam);
} }

View File

@ -1,9 +1,7 @@
package ai.chat2db.server.web.api.controller.rdb.request; package ai.chat2db.server.web.api.controller.rdb.request;
import jakarta.validation.constraints.NotNull;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequest; import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequest;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
/** /**