|
|
|
@ -146,22 +146,22 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
|
|
|
|
|
DataSourcePropertyDTO dataSourceProperty = new DataSourcePropertyDTO();
|
|
|
|
|
dataSourceProperty.setPoolName(sysDatasource.getPoolName());
|
|
|
|
|
dynamicRoutingDataSource.removeDataSource(sysDatasource.getPoolName());
|
|
|
|
|
// //计划删除数据源
|
|
|
|
|
// remotePlanService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//计划删除数据源
|
|
|
|
|
remotePlanService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//质量删除数据源
|
|
|
|
|
remoteQualityService.removeDatasource(dataSourceProperty);
|
|
|
|
|
// //mes删除数据源
|
|
|
|
|
// remoteMesService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//mes删除数据源
|
|
|
|
|
remoteMesService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//wms删除数据源
|
|
|
|
|
remoteWmsService.removeDatasource(dataSourceProperty);
|
|
|
|
|
// //device删除数据源
|
|
|
|
|
// remoteDeviceService.removeDatasource(dataSourceProperty);
|
|
|
|
|
// //open删除数据源
|
|
|
|
|
// remoteOpenService.removeDatasource(dataSourceProperty);
|
|
|
|
|
// //sap删除数据源
|
|
|
|
|
// remoteSapService.removeDatasource(dataSourceProperty);
|
|
|
|
|
// //工艺删除数据源
|
|
|
|
|
// remoteTechnologyService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//device删除数据源
|
|
|
|
|
remoteDeviceService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//open删除数据源
|
|
|
|
|
remoteOpenService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//sap删除数据源
|
|
|
|
|
remoteSapService.removeDatasource(dataSourceProperty);
|
|
|
|
|
//工艺删除数据源
|
|
|
|
|
remoteTechnologyService.removeDatasource(dataSourceProperty);
|
|
|
|
|
}
|
|
|
|
|
sysDatasourceMapper.deleteSysDatasourceByIds(ids);
|
|
|
|
|
sysDatasourceMapper.deleteUserByIds(ids);
|
|
|
|
@ -267,21 +267,21 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
|
|
|
|
|
DataSourcePropertyDTO dto = new DataSourcePropertyDTO();
|
|
|
|
|
BeanUtils.copyProperties(dataSourceProperty,dto);
|
|
|
|
|
//计划加入数据源
|
|
|
|
|
// remotePlanService.addDatasource(dto);
|
|
|
|
|
remotePlanService.addDatasource(dto);
|
|
|
|
|
//质量加入数据源
|
|
|
|
|
remoteQualityService.addDatasource(dto);
|
|
|
|
|
// //mes加入数据源
|
|
|
|
|
// remoteMesService.addDatasource(dto);
|
|
|
|
|
//mes加入数据源
|
|
|
|
|
remoteMesService.addDatasource(dto);
|
|
|
|
|
//wms加入数据源
|
|
|
|
|
remoteWmsService.addDatasource(dto);
|
|
|
|
|
// //device加入数据源
|
|
|
|
|
// remoteDeviceService.addDatasource(dto);
|
|
|
|
|
// //open加入数据源
|
|
|
|
|
// remoteOpenService.addDatasource(dto);
|
|
|
|
|
// //sap加入数据源
|
|
|
|
|
// remoteSapService.addDatasource(dto);
|
|
|
|
|
// //工艺加入数据源
|
|
|
|
|
// remoteTechnologyService.addDatasource(dto);
|
|
|
|
|
//device加入数据源
|
|
|
|
|
remoteDeviceService.addDatasource(dto);
|
|
|
|
|
//open加入数据源
|
|
|
|
|
remoteOpenService.addDatasource(dto);
|
|
|
|
|
//sap加入数据源
|
|
|
|
|
remoteSapService.addDatasource(dto);
|
|
|
|
|
//工艺加入数据源
|
|
|
|
|
remoteTechnologyService.addDatasource(dto);
|
|
|
|
|
|
|
|
|
|
return "数据库链接测试成功,数据库链接状态正常";
|
|
|
|
|
} catch (ClassNotFoundException | SQLException classNotFoundException) {
|
|
|
|
|