public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 02:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态

Browse Source
This commit is contained in:
taojinlong
2021-08-23 16:27:05 +08:00
parent 378a034f85
commit 4eaaf2273e
4 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
View File

@@ -7,6 +7,7 @@ import io.dataease.base.domain.Datasource;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager;
import io.dataease.controller.ResultHolder;
import io.dataease.controller.request.DatasourceUnionRequest;
import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.datasource.dto.DBTableDTO;
@@ -41,6 +42,13 @@ public class DatasourceController {
datasourceService.validate(datasource);
}
@ApiOperation("验证数据源")
@GetMapping("/validate/{datasourceId}")
public ResultHolder validate(@PathVariable String datasourceId) {
return datasourceService.validate(datasourceId);
}
@ApiOperation("查询当前用户数据源")
@GetMapping("/list")
public List<DatasourceDTO> getDatasourceList() throws Exception {

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

@@ -9,6 +9,7 @@ import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.CommonThreadPool;
import io.dataease.commons.utils.LogUtil;
import io.dataease.controller.ResultHolder;
import io.dataease.controller.request.DatasourceUnionRequest;
import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.controller.sys.base.ConditionEntity;
@@ -126,13 +127,23 @@ public class DatasourceService {
datasourceProvider.checkStatus(datasourceRequest);
}
public void validate(String datasourceId) throws Exception {
if(StringUtils.isEmpty(datasourceId)){
return;
}
public ResultHolder validate(String datasourceId) {
Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
validate(datasource);
if(datasource == null){
return ResultHolder.error("Can not find datasource: "+ datasourceId);
}
try {
validate(datasource);
datasource.setStatus("Success");
return ResultHolder.success("Success");
}catch (Exception e){
datasource.setStatus("Error");
return ResultHolder.error("Datasource is invalid: " + e.getMessage());
}finally {
datasourceMapper.updateByPrimaryKey(datasource);
}
}
public List<String> getSchema(Datasource datasource) throws Exception {
DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();