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

support add service name

Browse Source
This commit is contained in:
SwallowGG
2023-11-09 17:29:36 +08:00
parent 1b36648819
commit c29db6aeab
14 changed files with 744 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java
View File

@ -107,7 +107,7 @@ public class DataSourceServiceImpl implements DataSourceService {
return;
}
try (Connection connection = IDriverManager.getConnection(dataSource.getUrl(), dataSource.getUserName(),
dataSource.getPassword(), dataSource.getDriverConfig(), dataSource.getExtendMap())) {
dataSource.getPassword(), dataSource.getDriverConfig(), dataSource.getExtendMap())) {
DatabaseQueryAllParam databaseQueryAllParam = new DatabaseQueryAllParam();
databaseQueryAllParam.setDataSourceId(dataSourceId);
databaseQueryAllParam.setConnection(connection);
@ -184,8 +184,8 @@ public class DataSourceServiceImpl implements DataSourceService {
LambdaQueryWrapper<DataSourceDO> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(param.getSearchKey())) {
queryWrapper.and(wrapper -> wrapper.like(DataSourceDO::getAlias, "%" + param.getSearchKey() + "%")
.or()
.like(DataSourceDO::getUrl, "%" + param.getSearchKey() + "%"));
.or()
.like(DataSourceDO::getUrl, "%" + param.getSearchKey() + "%"));
}
Integer start = param.getPageNo();
Integer offset = param.getPageSize();
@ -203,9 +203,9 @@ public class DataSourceServiceImpl implements DataSourceService {
LoginUser loginUser = ContextUtils.getLoginUser();
IPage<DataSourceDO> iPage = dataSourceCustomMapper.selectPageWithPermission(
new Page<>(param.getPageNo(), param.getPageSize()),
BooleanUtils.isTrue(loginUser.getAdmin()), loginUser.getId(), param.getSearchKey(), param.getKind(),
EasySqlUtils.orderBy(param.getOrderByList()));
new Page<>(param.getPageNo(), param.getPageSize()),
BooleanUtils.isTrue(loginUser.getAdmin()), loginUser.getId(), param.getSearchKey(), param.getKind(),
EasySqlUtils.orderBy(param.getOrderByList()));
List<DataSource> dataSources = dataSourceConverter.do2dto(iPage.getRecords());
@ -235,18 +235,18 @@ public class DataSourceServiceImpl implements DataSourceService {
@Override
public ActionResult preConnect(DataSourcePreConnectParam param) {
DataSourceTestParam testParam
= dataSourceConverter.param2param(param);
= dataSourceConverter.param2param(param);
DriverConfig driverConfig = testParam.getDriverConfig();
if (driverConfig == null || !driverConfig.notEmpty()) {
driverConfig = Chat2DBContext.getDefaultDriverConfig(param.getType());
}
DataSourceConnect dataSourceConnect = JdbcUtils.testConnect(testParam.getUrl(), testParam.getHost(),
testParam.getPort(),
testParam.getUsername(), testParam.getPassword(), testParam.getDbType(),
driverConfig, param.getSsh(), KeyValue.toMap(param.getExtendInfo()));
testParam.getPort(),
testParam.getUsername(), testParam.getPassword(), testParam.getDbType(),
driverConfig, param.getSsh(), KeyValue.toMap(param.getExtendInfo()));
if (BooleanUtils.isNotTrue(dataSourceConnect.getSuccess())) {
return ActionResult.fail(dataSourceConnect.getMessage(), dataSourceConnect.getDescription(),
dataSourceConnect.getErrorDetail());
dataSourceConnect.getErrorDetail());
}
return ActionResult.isSuccess();
}
@ -273,6 +273,26 @@ public class DataSourceServiceImpl implements DataSourceService {
}
fillEnvironment(list, selector);
fillExtendInfo(list);
}
private void fillExtendInfo(List<DataSource> list) {
for (DataSource dataSource : list) {
List<KeyValue> keyValues = dataSource.getExtendInfo();
if (CollectionUtils.isEmpty(keyValues)) {
continue;
}
for (KeyValue keyValue : keyValues) {
if (keyValue != null) {
if ("serviceName".equalsIgnoreCase(keyValue.getKey())) {
}
}
}
}
}
private void fillEnvironment(List<DataSource> list, DataSourceSelector selector) {