|
|
@@ -21,6 +21,7 @@ import com.usoftchina.bi.core.jdbc.DynamicDataSourceRegister;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
@@ -41,6 +42,7 @@ public class DataBasesService {
|
|
|
/*
|
|
|
保存数据库连接
|
|
|
*/
|
|
|
+ @Transactional
|
|
|
public RepEntity inputDatabases(DatabasesInfo databasesInfo){
|
|
|
if (databasesInfo == null || "".equals(databasesInfo)){
|
|
|
return new RepEntity(RepCode.Null);
|
|
|
@@ -93,12 +95,16 @@ public class DataBasesService {
|
|
|
/*
|
|
|
修改数据库配置
|
|
|
*/
|
|
|
+ @Transactional
|
|
|
public RepEntity updatabases(DatabasesInfo databasesInfo){
|
|
|
Databases databases = new Databases();
|
|
|
BeanUtils.copyProperties(databasesInfo, databases);
|
|
|
if (databases.getPassWord() == null || "".equals(databases.getPassWord())){
|
|
|
databases.setPassWord(null);
|
|
|
}
|
|
|
+ //校验此连接是否可用
|
|
|
+ implementSqlService.connectTest(databases);
|
|
|
+ //更新
|
|
|
dataConnectorMapper.updatabases(databases);
|
|
|
DatabasesInfo databasesInfo1 = dataConnectorMapper.getDatabases(databasesInfo.getId());
|
|
|
addDataSource(databasesInfo1);
|