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

feat(数据集): 连接 数据源，读取 表名

Browse Source
This commit is contained in:
junjie
2021-02-23 14:31:56 +08:00
parent 62ba927435
commit 7720debbaf
10 changed files with 195 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ public class DatasourceController {
}
@PostMapping("/validate")
public void validate(@RequestBody Datasource datasource) throws Exception{
public void validate(@RequestBody Datasource datasource) throws Exception {
datasourceService.validate(datasource);
}
@@ -34,7 +34,7 @@ public class DatasourceController {
}
@PostMapping("/list/{goPage}/{pageSize}")
public Pager<List<Datasource>> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception{
public Pager<List<Datasource>> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, datasourceService.getDatasourceList(request));
}
@@ -48,4 +48,9 @@ public class DatasourceController {
public void updateDatasource(@RequestBody Datasource Datasource) {
datasourceService.updateDatasource(Datasource);
}
@PostMapping("/getTables")
public List<String> getTables(@RequestBody Datasource datasource) throws Exception {
return datasourceService.getTables(datasource);
}
}

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

@@ -30,7 +30,7 @@ public class DatasourceService {
public Datasource addDatasource(Datasource datasource) {
DatasourceExample example = new DatasourceExample();
example.createCriteria().andNameEqualTo(datasource.getName());
if(CollectionUtils.isNotEmpty(datasourceMapper.selectByExample(example))){
if (CollectionUtils.isNotEmpty(datasourceMapper.selectByExample(example))) {
DEException.throwException("Exist data connection with the same name ");
}
long currentTimeMillis = System.currentTimeMillis();
@@ -41,7 +41,7 @@ public class DatasourceService {
return datasource;
}
public List<Datasource> getDatasourceList(Datasource request)throws Exception{
public List<Datasource> getDatasourceList(Datasource request) throws Exception {
DatasourceExample example = new DatasourceExample();
DatasourceExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(request.getName())) {
@@ -64,13 +64,19 @@ public class DatasourceService {
datasourceMapper.updateByPrimaryKeySelective(datasource);
}
public void validate(Datasource datasource)throws Exception {
public void validate(Datasource datasource) throws Exception {
DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
datasourceProvider.test(datasourceRequest);
}
public List<String> getTables(Datasource datasource) throws Exception {
Datasource ds = datasourceMapper.selectByPrimaryKey(datasource.getId());
DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(ds);
return datasourceProvider.getTables(datasourceRequest);
}
}