|
|
@@ -36,16 +36,19 @@ public class DataBasesService {
|
|
|
private DynamicDataSourceRegister dataSourceRegister;
|
|
|
@Autowired
|
|
|
GetChartsDataUtilService getChartsDataUtilService;
|
|
|
+ @Autowired
|
|
|
+ private ImplementSqlService implementSqlService;
|
|
|
/*
|
|
|
保存数据库连接
|
|
|
*/
|
|
|
-
|
|
|
public RepEntity inputDatabases(DatabasesInfo databasesInfo){
|
|
|
if (databasesInfo == null || "".equals(databasesInfo)){
|
|
|
return new RepEntity(RepCode.Null);
|
|
|
}
|
|
|
Databases databases = new Databases();
|
|
|
BeanUtils.copyProperties(databasesInfo, databases);
|
|
|
+ //校验此连接是否可用
|
|
|
+ implementSqlService.connectTest(databases);
|
|
|
String note = databases.getNote();
|
|
|
if (note == null || "".equals(note)){
|
|
|
note = "";
|
|
|
@@ -53,11 +56,9 @@ public class DataBasesService {
|
|
|
}
|
|
|
dataConnectorMapper.inputDataBases(databases);
|
|
|
int id = databases.getId();
|
|
|
-
|
|
|
databasesInfo.setId(id);
|
|
|
//添加数据源可切换
|
|
|
addDataSource(databasesInfo);
|
|
|
-
|
|
|
return new RepEntity(RepCode.success,id);
|
|
|
}
|
|
|
|