From 9f3254dc23a586ed8de8ea9a2b405ef6187b5d55 Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 14 Oct 2024 16:24:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=86=85=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5=E4=B8=8D=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/server/DatasourceServer.java | 9 +++++++++ de-xpack | 2 +- .../src/main/java/io/dataease/api/ds/DatasourceApi.java | 2 ++ .../api/xpack/dataFilling/dto/DataFillingDTO.java | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 7a4f6ea1e6..2f789541d9 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -488,6 +488,15 @@ public class DatasourceServer implements DatasourceApi { return getDatasourceDTOById(datasourceId, false); } + @Override + public String getName(Long datasourceId) throws DEException { + CoreDatasource datasource = datasourceMapper.selectById(datasourceId); + if (datasource == null) { + DEException.throwException("不存在的数据源！"); + } + return datasource.getName(); + } + @Override public List innerList(List ids, List types) throws DEException { List list = new ArrayList<>(); diff --git a/de-xpack b/de-xpack index 0f366f1a1d..9e045fdd0b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 0f366f1a1d66d5a7f24d12dc0c07669b26234627 +Subproject commit 9e045fdd0b33b058a15ac44affbeb2c1eb12552a diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java index e3489db647..d25ed62131 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java @@ -150,6 +150,8 @@ public interface DatasourceApi { DatasourceDTO innerGet(Long datasourceId) throws DEException; + String getName(Long datasourceId) throws DEException; + List innerList(List ids, List types) throws DEException; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java index e7187cdc61..b80739be52 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java @@ -47,6 +47,8 @@ public class DataFillingDTO implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long datasource; + private String datasourceName; + /** * 表单内容 */