Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

报表基础模块：1、数据源接口swagger备注修正；2、数据源列表接口增加回调字段type、buildType、beanId；

Browse Source
This commit is contained in:
gaoqr
2024-09-06 13:59:10 +08:00
parent 3adf2c7b22
commit 70b02df792
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
+2 -3
View File
@@ -8,7 +8,6 @@ import com.bstek.ureport.definition.dataset.Field;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportBeanDatasourceRespVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceRespVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO;
import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO;
@@ -83,7 +82,7 @@ public class ReportDatasourceController {
}
@GetMapping("/datasources")
@Operation(summary = "获取报表数据源")
@Operation(summary = "获取报表数据源列表")
// @PreAuthorize("@ss.hasPermission('report:datasource:query')")
public CommonResult<List<ReportDatasourceRespVO>> getDatasourcePage() {
return success(BeanUtils.toBean(datasourceService.getDatasourceList(), ReportDatasourceRespVO.class));
@@ -135,7 +134,7 @@ public class ReportDatasourceController {
}
@PostMapping("/datasource/tables")
@Operation(summary = "获取数据源表列表")
@Operation(summary = "获取数据库表列表")
// @PreAuthorize("@ss.hasPermission('report:datasource:query')")
public CommonResult<List<Map<String, String>>> getDatasourceTables(@RequestBody DataSourceInfo info) {
return success(ureportDataSourceService.selectTableList(info));
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java
+8 -1
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.report.controller.admin.datasource.vo;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetRespVO;
import com.cf.imes.module.report.enums.datasource.ReportDatasourceTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -29,7 +30,13 @@ public class ReportDatasourceRespVO {
private String name;
@Schema(description = "数据源类型，jdbc、spring、api", example = "0")
private Integer type;
private ReportDatasourceTypeEnum type;
@Schema(description = "内置类型：0是、1否")
private Integer buildinType;
@Schema(description = "spring型数据源id")
private String beanId;
@Schema(description = "数据源驱动类",example = "com.mysql.cj.jdbc.Driver")
private String driver;