diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java index 9e7a5eb8..4a0178b0 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java @@ -27,12 +27,6 @@ import ai.chat2db.spi.model.ExecuteResult; import ai.chat2db.spi.sql.Chat2DBContext; import ai.chat2db.spi.sql.SQLExecutor; 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 org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -123,7 +117,7 @@ public class DlTemplateServiceImpl implements DlTemplateService { // 解析sql分页 SQLStatement sqlStatement = SQLUtils.parseSingleStatement(sql, dbType); if (!(sqlStatement instanceof SQLSelectStatement)) { - throw new BusinessException("当前sql不是查询语句"); + throw new BusinessException("dataSource.sqlAnalysisError"); } sql = PagerUtils.count(sql, dbType); ExecuteResult executeResult = execute(sql); diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/aspect/ConnectionInfoHandler.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/aspect/ConnectionInfoHandler.java index 6747520b..2029d365 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/aspect/ConnectionInfoHandler.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/aspect/ConnectionInfoHandler.java @@ -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.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.common.exception.ParamBusinessException; 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.spi.sql.Chat2DBContext; +import ai.chat2db.spi.sql.ConnectInfo; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -62,7 +61,7 @@ public class ConnectionInfoHandler { DataResult result = dataSourceService.queryById(dataSourceId); DataSource dataSource = result.getData(); if (!result.success() && dataSource != null) { - throw new SystemException("dataSourceId ERROR"); + throw new ParamBusinessException("dataSourceId"); } ConnectInfo connectInfo = new ConnectInfo(); connectInfo.setAlias(dataSource.getAlias());