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; + /** * 表单内容 */