opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-30 03:03:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix null point error

Browse Source
This commit is contained in:
SwallowGG
2023-12-28 19:10:04 +08:00
parent 80142e3cc5
commit 358a23da20
11 changed files with 179 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java
View File

@ -8,6 +8,7 @@ import java.util.concurrent.Executors;
import ai.chat2db.server.domain.api.model.Config;
import ai.chat2db.server.domain.api.param.DlExecuteParam;
import ai.chat2db.server.domain.api.param.OrderByParam;
import ai.chat2db.server.domain.api.param.UpdateSelectResultParam;
import ai.chat2db.server.domain.api.service.ConfigService;
import ai.chat2db.server.domain.api.service.DlTemplateService;
@ -17,10 +18,7 @@ import ai.chat2db.server.tools.base.wrapper.result.ListResult;
import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect;
import ai.chat2db.server.web.api.controller.ai.chat2db.client.Chat2dbAIClient;
import ai.chat2db.server.web.api.controller.rdb.converter.RdbWebConverter;
import ai.chat2db.server.web.api.controller.rdb.request.DdlCountRequest;
import ai.chat2db.server.web.api.controller.rdb.request.DmlRequest;
import ai.chat2db.server.web.api.controller.rdb.request.DmlTableRequest;
import ai.chat2db.server.web.api.controller.rdb.request.SelectResultUpdateRequest;
import ai.chat2db.server.web.api.controller.rdb.request.*;
import ai.chat2db.server.web.api.controller.rdb.vo.ExecuteResultVO;
import ai.chat2db.server.web.api.http.GatewayClientService;
import ai.chat2db.server.web.api.http.request.SqlExecuteHistoryCreateRequest;
@ -167,6 +165,15 @@ public class RdbDmlController {
return dlTemplateService.updateSelectResult(param);
}
@RequestMapping(value = "/get_order_by_sql", method = {RequestMethod.POST, RequestMethod.PUT})
public DataResult<String> getOrderBySql(@RequestBody OrderByRequest request) {
OrderByParam param = rdbWebConverter.request2param(request);
return dlTemplateService.getOrderBySql(param);
}
/**
* 增删改查等数据运维
*

4
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/TriggerController.java
View File

@ -27,8 +27,8 @@ public class TriggerController {
public WebPageResult<Trigger> list(@Valid TriggerPageRequest request) {
ListResult<Trigger> listResult = triggerService.triggers(request.getDatabaseName(), request.getSchemaName());
Long total = CollectionUtils.isNotEmpty(listResult.getData()) ? Long.valueOf(listResult.getData().size()) : 0L;
return WebPageResult.of(listResult.getData(), total, 1,
listResult.getData().size());
Integer pageSize = listResult.getData() != null ? listResult.getData().size() : 0;
return WebPageResult.of(listResult.getData(), total, 1, pageSize);
}
@GetMapping("/detail")

3
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/ViewController.java
View File

@ -43,7 +43,8 @@ public class ViewController {
public WebPageResult<TableVO> list(@Valid TableBriefQueryRequest request) {
ListResult<Table> tableDTOPageResult = viewService.views(request.getDatabaseName(), request.getSchemaName());
List<TableVO> tableVOS = rdbWebConverter.tableDto2vo(tableDTOPageResult.getData());
return WebPageResult.of(tableVOS, Long.valueOf(tableVOS.size()), 1, tableVOS.size());
Integer pageSize = tableDTOPageResult.getData() != null ? tableDTOPageResult.getData().size() : 0;
return WebPageResult.of(tableVOS, Long.valueOf(tableVOS.size()), 1, pageSize);
}

8
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/converter/RdbWebConverter.java
View File

@ -42,6 +42,14 @@ public abstract class RdbWebConverter {
public abstract DlExecuteParam request2param(DmlRequest request);
/**
* 参数转换
*
* @param request
* @return
*/
public abstract OrderByParam request2param(OrderByRequest request);
/**
* 参数转换
*

23
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/OrderByRequest.java Normal file
View File

@ -0,0 +1,23 @@
package ai.chat2db.server.web.api.controller.rdb.request;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequest;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequestInfo;
import ai.chat2db.spi.model.OrderBy;
import lombok.Data;
import java.util.List;
@Data
public class OrderByRequest extends DataSourceBaseRequest implements DataSourceBaseRequestInfo {
/**
* origin sql
*/
private String originSql;
/**
* 排序字段
*/
private List<OrderBy> orderByList;
}