From 70b02df792e07cf36942f57d88739c40cd2533e5 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 6 Sep 2024 13:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A1=E3=80=81=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3swagger=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5type=E3=80=81buildType=E3=80=81beanId?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/datasource/ReportDatasourceController.java     | 5 ++---
 .../admin/datasource/vo/ReportDatasourceRespVO.java      | 9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
index 44c5bc9af..30ca3fc46 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
@@ -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));
diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java
index de05540f5..5b848a6b8 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java
@@ -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;