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

feat: datasource采用新的列表

Browse Source
This commit is contained in:
fit2cloud-chenyw
2021-03-15 12:12:14 +08:00
parent a0ee5d636f
commit 105d8a2a5f
8 changed files with 173 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.java Normal file
View File

@@ -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<Datasource> query(GridExample example);
}

25
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.dataease.base.mapper.ext.ExtDataSourceMapper">
<select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="io.dataease.base.mapper.DatasourceMapper.BaseResultMap">
select id , name , `desc` ,`type` , configuration ,create_time ,update_time from datasource
<if test="_parameter != null">
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
<if test="orderByClause == null">
order by update_time desc
</if>
</select>
</mapper>

2
backend/src/main/java/io/dataease/base/mapper/ext/ExtDeptMapper.xml
View File

@@ -12,7 +12,7 @@
</select>
<select id="nodesByExample" resultType="io.dataease.base.mapper.ext.query.GridExample" resultMap="simpleNode">
<select id="nodesByExample" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="simpleNode">
select dept_id as id, pid from sys_dept
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
</select>

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

@@ -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<List<Datasource>> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
public Pager<List<Datasource>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
Page<Object> 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}")

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

@@ -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<Datasource> gridQuery(BaseGridRequest request){
GridExample gridExample = request.convertExample();
return extDataSourceMapper.query(gridExample);
}
public void deleteDatasource(String datasourceId) {
datasourceMapper.deleteByPrimaryKey(datasourceId);
}