From 105d8a2a5fa66ea2c2194b6c364a1fdf109bc0a7 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 Mar 2021 12:12:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20datasource=E9=87=87=E7=94=A8=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtDataSourceMapper.java | 11 + .../base/mapper/ext/ExtDataSourceMapper.xml | 25 ++ .../base/mapper/ext/ExtDeptMapper.xml | 2 +- .../controller/DatasourceController.java | 6 +- .../datasource/service/DatasourceService.java | 11 + frontend/src/api/system/datasource.js | 1 + frontend/src/lang/zh.js | 2 +- .../src/views/system/datasource/index.vue | 379 ++++++------------ 8 files changed, 173 insertions(+), 264 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.java new file mode 100644 index 0000000000..0303cadd8d --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.java @@ -0,0 +1,11 @@ +package io.dataease.base.mapper.ext; + +import io.dataease.base.domain.Datasource; +import io.dataease.base.mapper.ext.query.GridExample; + +import java.util.List; + +public interface ExtDataSourceMapper { + + List query(GridExample example); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml new file mode 100644 index 0000000000..4d4988ec9c --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDeptMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDeptMapper.xml index 9dcec17d12..a47f873a84 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDeptMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDeptMapper.xml @@ -12,7 +12,7 @@ - select dept_id as id, pid from sys_dept diff --git a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java index b019df64a5..c04b3fc470 100644 --- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java +++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import io.dataease.base.domain.Datasource; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; +import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.datasource.service.DatasourceService; import org.springframework.web.bind.annotation.*; @@ -34,9 +35,10 @@ public class DatasourceController { } @PostMapping("/list/{goPage}/{pageSize}") - public Pager> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { + public Pager> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { Page page = PageHelper.startPage(goPage, pageSize, true); - return PageUtils.setPageInfo(page, datasourceService.getDatasourceList(request)); + // return PageUtils.setPageInfo(page, datasourceService.getDatasourceList(request)); + return PageUtils.setPageInfo(page, datasourceService.gridQuery(request)); } @GetMapping("/delete/{datasourceID}") diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java index 5924dd3d41..24f6b2a4c0 100644 --- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java +++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java @@ -2,7 +2,10 @@ package io.dataease.datasource.service; import io.dataease.base.domain.*; import io.dataease.base.mapper.*; +import io.dataease.base.mapper.ext.ExtDataSourceMapper; +import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.commons.exception.DEException; +import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.request.DatasourceRequest; @@ -22,6 +25,9 @@ public class DatasourceService { @Resource private DatasourceMapper datasourceMapper; + @Resource + private ExtDataSourceMapper extDataSourceMapper; + public Datasource addDatasource(Datasource datasource) { DatasourceExample example = new DatasourceExample(); example.createCriteria().andNameEqualTo(datasource.getName()); @@ -49,6 +55,11 @@ public class DatasourceService { return datasourceMapper.selectByExampleWithBLOBs(example); } + public List gridQuery(BaseGridRequest request){ + GridExample gridExample = request.convertExample(); + return extDataSourceMapper.query(gridExample); + } + public void deleteDatasource(String datasourceId) { datasourceMapper.deleteByPrimaryKey(datasourceId); } diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js index 611338fed1..a8deddbff8 100644 --- a/frontend/src/api/system/datasource.js +++ b/frontend/src/api/system/datasource.js @@ -4,6 +4,7 @@ export function dsGrid(pageIndex, pageSize, data) { return request({ url: 'datasource/list/' + pageIndex + '/' + pageSize, method: 'post', + loading: true, data }) } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index efd0a7e737..82175f45d0 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -682,7 +682,7 @@ export default { please_input_password: '请输入密码', please_input_host: '请输入主机', please_input_port: '请输入端口', - modify: '修改组织', + modify: '编辑数据连接', validate_success: '校验成功', delete: '删除组织', delete_confirm: '删除该组织会关联删除该组织下的所有资源(如：相关工作空间，项目，测试用例等），确定要删除吗?', diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue index d41269deff..347f51134b 100644 --- a/frontend/src/views/system/datasource/index.vue +++ b/frontend/src/views/system/datasource/index.vue @@ -1,40 +1,32 @@