From 76141c85dc00aa7a82e307ee35b3b4897eef0233 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 2 Nov 2021 15:42:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90,=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BF=9D=E6=8C=81=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/utils/ExcelXlsReader.java | 5 +++- .../datasource/DatasourceController.java | 9 ++++++- .../service/datasource/DatasourceService.java | 2 +- frontend/src/api/system/datasource.js | 7 ++++++ .../src/views/system/datasource/DsMain.vue | 10 ++++---- .../src/views/system/datasource/DsTree.vue | 24 ++++++++++++++++--- frontend/src/views/system/datasource/form.vue | 9 ++++--- 7 files changed, 51 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java index 0b16ec2d9f..d2665d98f3 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java @@ -331,7 +331,10 @@ public class ExcelXlsReader implements HSSFListener { totalSheets.add(excelSheetData); }else { List tmp = new ArrayList<>(cellList); - totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + if(totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < 100){ + totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + } + totalRows++; } } diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java index 377265cb30..3c489d68f4 100644 --- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java +++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java @@ -20,6 +20,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; @Api(tags = "数据源：数据源管理") @ApiSupport(order = 30) @@ -32,7 +33,7 @@ public class DatasourceController { @ApiOperation("新增数据源") @PostMapping("/add") - public Datasource addDatasource(@RequestBody Datasource datasource) { + public Datasource addDatasource(@RequestBody Datasource datasource) throws Exception{ return datasourceService.addDatasource(datasource); } @@ -57,6 +58,12 @@ public class DatasourceController { return datasourceService.getDatasourceList(request); } + @ApiOperation("查询当前用户数据源") + @GetMapping("/list/{type}") + public List getDatasourceListByType(@PathVariable String type) throws Exception { + return getDatasourceList().stream().filter(datasourceDTO -> datasourceDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList()); + } + @ApiIgnore @PostMapping("/list/{goPage}/{pageSize}") public Pager> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 4c286eda89..d21777cefb 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -57,7 +57,7 @@ public class DatasourceService { @Resource private CommonThreadPool commonThreadPool; - public Datasource addDatasource(Datasource datasource) { + public Datasource addDatasource(Datasource datasource) throws Exception{ checkName(datasource); long currentTimeMillis = System.currentTimeMillis(); datasource.setId(UUID.randomUUID().toString()); diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js index 2cea64d8ff..19452d0d67 100644 --- a/frontend/src/api/system/datasource.js +++ b/frontend/src/api/system/datasource.js @@ -15,6 +15,13 @@ export function listDatasource() { method: 'get' }) } +export function listDatasourceByType(type) { + return request({ + url: '/datasource/list/' + type, + loading: true, + method: 'get' + }) +} export function addDs(data) { return request({ url: 'datasource/add/', diff --git a/frontend/src/views/system/datasource/DsMain.vue b/frontend/src/views/system/datasource/DsMain.vue index c2bc1495aa..7de8b42ca8 100644 --- a/frontend/src/views/system/datasource/DsMain.vue +++ b/frontend/src/views/system/datasource/DsMain.vue @@ -1,10 +1,10 @@ @@ -22,6 +22,7 @@ export default { data() { return { component: DataHome, + datasource: {}, param: null } }, @@ -53,8 +54,9 @@ export default { } }) }, - refreshTree() { - this.$refs.dsTree && this.$refs.dsTree.queryTreeDatas() + refreshType(datasource) { + this.datasource = datasource; + this.$refs.dsTree && this.$refs.dsTree.refreshType(datasource) }, msg2Current(sourceParam) { this.$refs.dsTree && this.$refs.dsTree.markInvalid(sourceParam) diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index f05d5f6462..ffed65f504 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -87,10 +87,16 @@