09041201:修改同步资产结构的逻辑
parent
58dd47e20a
commit
0c71f5add7
|
@ -119,32 +119,6 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Boolean testConnection(DataSource etlDataScore) {
|
public Boolean testConnection(DataSource etlDataScore) {
|
||||||
// DataType dataType = dataTypeService.getOne(new LambdaQueryWrapper<>() {{
|
|
||||||
// eq(DataType::getType, dataSource.getDataType());
|
|
||||||
// }});
|
|
||||||
// String jdbcUrl = "";
|
|
||||||
// String className = "";
|
|
||||||
// boolean flag = false;
|
|
||||||
// try {
|
|
||||||
// //判空
|
|
||||||
// if (dataType.getDriverManager() != null && dataType.getPrefix() != null) {
|
|
||||||
// if ("MySql".equals(dataType.getType())) {
|
|
||||||
// className = dataType.getDriverManager();
|
|
||||||
// //mysql拼接连接路径
|
|
||||||
// jdbcUrl = dataType.getDriverManager() + dataType.getPrefix() + dataSource.getIp() + ":" + dataSource.getPort() + "/" + dataSource.getDatabaseName() + "?" + dataSource.getConnectionParam();
|
|
||||||
// }
|
|
||||||
// if ("Oracle".equals(dataType.getType())) {
|
|
||||||
// className = dataType.getDriverManager();
|
|
||||||
// //oracle拼接连接路径
|
|
||||||
// jdbcUrl = dataType.getDriverManager() + dataType.getPrefix() + dataSource.getIp() + ":" + dataSource.getPort() + ":" + dataSource.getDatabaseName() + "?" + dataSource.getConnectionParam();
|
|
||||||
// }
|
|
||||||
// flag = testConnection(className, jdbcUrl, dataSource.getUserName(), dataSource.getPassword());
|
|
||||||
// }
|
|
||||||
// return flag;
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// e.printStackTrace();
|
|
||||||
// }
|
|
||||||
// return flag;
|
|
||||||
if (etlDataScore.getDataType().equals(MYSQL)) {
|
if (etlDataScore.getDataType().equals(MYSQL)) {
|
||||||
MysqlPool mysqlPool = new MysqlPool(etlDataScore);
|
MysqlPool mysqlPool = new MysqlPool(etlDataScore);
|
||||||
mysqlPool.init();
|
mysqlPool.init();
|
||||||
|
@ -174,19 +148,19 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
|
||||||
.last("limit 1");
|
.last("limit 1");
|
||||||
}});
|
}});
|
||||||
//如果存在就删除
|
//如果存在就删除
|
||||||
if(StringUtils.isNotNull(tableInfoServiceOne)){
|
if (StringUtils.isNotNull(tableInfoServiceOne)) {
|
||||||
List<TableInfo> list = tableInfoService.list(new LambdaQueryWrapper<>() {{
|
List<TableInfo> list = tableInfoService.list(new LambdaQueryWrapper<>() {{
|
||||||
eq(TableInfo::getBasicId, etlDataScore.getId());
|
eq(TableInfo::getBasicId, etlDataScore.getId());
|
||||||
}});
|
}});
|
||||||
list.forEach(tableInfo -> {
|
list.forEach(tableInfo -> {
|
||||||
structureService.remove(new LambdaQueryWrapper<>(){{
|
structureService.remove(new LambdaQueryWrapper<>() {{
|
||||||
eq(Structure::getTableId, tableInfo.getId());
|
eq(Structure::getTableId, tableInfo.getId());
|
||||||
}});
|
}});
|
||||||
});
|
});
|
||||||
tableInfoService.remove(new LambdaQueryWrapper<>(){{
|
tableInfoService.remove(new LambdaQueryWrapper<>() {{
|
||||||
eq(TableInfo::getBasicId, etlDataScore.getId());
|
eq(TableInfo::getBasicId, etlDataScore.getId());
|
||||||
}});
|
}});
|
||||||
assetAuthorizationService.remove(new LambdaQueryWrapper<>(){{
|
assetAuthorizationService.remove(new LambdaQueryWrapper<>() {{
|
||||||
eq(AssetAuthorization::getTableId, tableInfoServiceOne.getId())
|
eq(AssetAuthorization::getTableId, tableInfoServiceOne.getId())
|
||||||
.or()
|
.or()
|
||||||
.eq(AssetAuthorization::getBasicId, etlDataScore.getId());
|
.eq(AssetAuthorization::getBasicId, etlDataScore.getId());
|
||||||
|
@ -336,29 +310,6 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 建立连接
|
|
||||||
*
|
|
||||||
* @param driverManager 驱动
|
|
||||||
* @param jdbcUrl 连接路径
|
|
||||||
* @param userName 用户名
|
|
||||||
* @param password 密码
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
// private boolean testConnection(String driverManager, String jdbcUrl, String userName, String password) {
|
|
||||||
// // 判断参数是否为空
|
|
||||||
// if (StringUtils.isNotEmpty(driverManager) && StringUtils.isNotEmpty(jdbcUrl) && StringUtils.isNotEmpty(userName) && StringUtils.isNotEmpty(password)) {
|
|
||||||
// try {
|
|
||||||
// // 加载驱动
|
|
||||||
// Class.forName(driverManager);
|
|
||||||
// return true;
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// e.printStackTrace();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue