Example Modify the verification prompt

This commit is contained in:
JiaJu Zhuang
2023-06-23 15:03:36 +08:00
parent e6ef675fb6
commit 102084fbdd
2 changed files with 5 additions and 12 deletions

View File

@ -27,12 +27,6 @@ import ai.chat2db.spi.model.ExecuteResult;
import ai.chat2db.spi.sql.Chat2DBContext; import ai.chat2db.spi.sql.Chat2DBContext;
import ai.chat2db.spi.sql.SQLExecutor; import ai.chat2db.spi.sql.SQLExecutor;
import ai.chat2db.spi.util.JdbcUtils; import ai.chat2db.spi.util.JdbcUtils;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.PagerUtils;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.parser.SQLParserUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
@ -123,7 +117,7 @@ public class DlTemplateServiceImpl implements DlTemplateService {
// 解析sql分页 // 解析sql分页
SQLStatement sqlStatement = SQLUtils.parseSingleStatement(sql, dbType); SQLStatement sqlStatement = SQLUtils.parseSingleStatement(sql, dbType);
if (!(sqlStatement instanceof SQLSelectStatement)) { if (!(sqlStatement instanceof SQLSelectStatement)) {
throw new BusinessException("当前sql不是查询语句"); throw new BusinessException("dataSource.sqlAnalysisError");
} }
sql = PagerUtils.count(sql, dbType); sql = PagerUtils.count(sql, dbType);
ExecuteResult executeResult = execute(sql); ExecuteResult executeResult = execute(sql);

View File

@ -6,13 +6,12 @@ package ai.chat2db.server.web.api.aspect;
import ai.chat2db.server.domain.api.model.DataSource; import ai.chat2db.server.domain.api.model.DataSource;
import ai.chat2db.server.domain.api.service.DataSourceService; import ai.chat2db.server.domain.api.service.DataSourceService;
import ai.chat2db.spi.sql.Chat2DBContext;
import ai.chat2db.spi.sql.ConnectInfo;
import ai.chat2db.server.tools.base.excption.SystemException;
import ai.chat2db.server.tools.base.wrapper.result.DataResult; import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.common.exception.ParamBusinessException;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequestInfo; import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequestInfo;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceConsoleRequestInfo; import ai.chat2db.server.web.api.controller.data.source.request.DataSourceConsoleRequestInfo;
import ai.chat2db.spi.sql.Chat2DBContext;
import ai.chat2db.spi.sql.ConnectInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
@ -62,7 +61,7 @@ public class ConnectionInfoHandler {
DataResult<DataSource> result = dataSourceService.queryById(dataSourceId); DataResult<DataSource> result = dataSourceService.queryById(dataSourceId);
DataSource dataSource = result.getData(); DataSource dataSource = result.getData();
if (!result.success() && dataSource != null) { if (!result.success() && dataSource != null) {
throw new SystemException("dataSourceId ERROR"); throw new ParamBusinessException("dataSourceId");
} }
ConnectInfo connectInfo = new ConnectInfo(); ConnectInfo connectInfo = new ConnectInfo();
connectInfo.setAlias(dataSource.getAlias()); connectInfo.setAlias(dataSource.getAlias());