center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4440 from dataease/pr@dev@pages

Browse Source 
fix: API 数据集状态显示
This commit is contained in:
taojinlong 2023-02-01 15:41:46 +08:00 committed by GitHub
commit 185087d19a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -292,6 +292,7 @@ public class DatasourceService {
public void updateDatasource(String id, Datasource datasource) { public void updateDatasource(String id, Datasource datasource) {
DatasourceExample example = new DatasourceExample(); DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(id); example.createCriteria().andIdEqualTo(id);
checkAndUpdateDatasourceStatus(datasource);
datasourceMapper.updateByExampleSelective(datasource, example); datasourceMapper.updateByExampleSelective(datasource, example);
handleConnectionPool(id); handleConnectionPool(id);
} }
@ -363,7 +364,6 @@ public class DatasourceService {
DatasourceRequest datasourceRequest = new DatasourceRequest(); DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource); datasourceRequest.setDatasource(datasource);
datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
if (datasource.getType().equalsIgnoreCase("api")) { if (datasource.getType().equalsIgnoreCase("api")) {
List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() { List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
}.getType()); }.getType());
@ -377,6 +377,7 @@ public class DatasourceService {
} }
} }
if (success == apiDefinitionList.size()) { if (success == apiDefinitionList.size()) {
datasource.setStatus(datasourceStatus);
return ResultHolder.success(datasource); return ResultHolder.success(datasource);
} }
if (success > 0 && success < apiDefinitionList.size()) { if (success > 0 && success < apiDefinitionList.size()) {