From f13b8c3c51aba6a14226c7b28b3382b1f048934f Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Mon, 31 Mar 2025 16:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86application=E5=92=8C?= =?UTF-8?q?module=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/module/mapper/ModuleMapper.java | 2 ++ .../dataset/dao/auto/entity/CoreDatasetGroup.java | 14 ++++++++++++++ .../datasource/dao/auto/entity/CoreDatasource.java | 14 +++++++++++++- .../dao/auto/entity/DataVisualizationInfo.java | 14 +++++++++++++- .../server/DataVisualizationServer.java | 3 ++- .../java/io/gisbi/api/ds/vo/BusiDsRequest.java | 2 ++ .../api/visualization/vo/DataVisualizationVO.java | 8 ++++++-- .../extensions/datasource/dto/DatasourceDTO.java | 4 ++++ 8 files changed, 56 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/mapper/ModuleMapper.java b/core/core-backend/src/main/java/io/gisbi/application/module/mapper/ModuleMapper.java index 13416e4..a121791 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/mapper/ModuleMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/mapper/ModuleMapper.java @@ -2,6 +2,7 @@ package io.gisbi.application.module.mapper; import io.gisbi.application.module.domain.Module; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author zhengsl * @since 2025-03-25 */ +@Mapper public interface ModuleMapper extends BaseMapper { } diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java index f9205db..cccc84f 100644 --- a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java @@ -26,6 +26,11 @@ public class CoreDatasetGroup implements Serializable { */ private String name; + /** + * 应用ID + */ + private String appId; + /** * 父级ID */ @@ -212,6 +217,7 @@ public class CoreDatasetGroup implements Serializable { public String toString() { return "CoreDatasetGroup{" + "id = " + id + + ", appId = " + appId + ", name = " + name + ", pid = " + pid + ", level = " + level + @@ -228,4 +234,12 @@ public class CoreDatasetGroup implements Serializable { ", unionSql = " + unionSql + "}"; } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } } diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java index 4855bb0..d00c55a 100644 --- a/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java @@ -23,7 +23,10 @@ public class CoreDatasource implements Serializable { */ @TableId(value = "id", type = IdType.AUTO) private Long id; - + /** + * 应用ID + */ + private String appId; /** * 名称 */ @@ -218,6 +221,7 @@ public class CoreDatasource implements Serializable { public String toString() { return "CoreDatasource{" + "id = " + id + + ", appId = " + appId + ", name = " + name + ", description = " + description + ", type = " + type + @@ -234,4 +238,12 @@ public class CoreDatasource implements Serializable { ", enableDataFill = " + enableDataFill + "}"; } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } } diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java index 1282fcb..1d1281a 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java @@ -17,7 +17,10 @@ public class DataVisualizationInfo implements Serializable { private static final long serialVersionUID = 1L; private Long id; - + /** + * 应用ID + */ + private String appId; /** * 名称 */ @@ -342,6 +345,7 @@ public class DataVisualizationInfo implements Serializable { public String toString() { return "DataVisualizationInfo{" + "id = " + id + + ", appId = " + appId + ", name = " + name + ", pid = " + pid + ", orgId = " + orgId + @@ -368,4 +372,12 @@ public class DataVisualizationInfo implements Serializable { ", checkVersion = " + checkVersion + "}"; } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } } diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java index 6f33a15..a46fe41 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java @@ -657,6 +657,7 @@ public class DataVisualizationServer implements DataVisualizationApi { String dynamicData = null; String staticResource = null; String appDataStr = null; + String appId = request.getAppId(); String name = null; String dvType = null; Integer version = null; @@ -758,7 +759,7 @@ public class DataVisualizationServer implements DataVisualizationApi { request.setCanvasStyleData(templateStyle); //Store static resource into the server staticResourceServer.saveFilesToServe(staticResource); - return new DataVisualizationVO(newDvId, name, dvType, version, templateStyle, templateData, appDataStr, canvasViewInfo, null); + return new DataVisualizationVO(newDvId,appId, name, dvType, version, templateStyle, templateData, appDataStr, canvasViewInfo, null); } catch (Exception e) { e.printStackTrace(); DEException.throwException("解析错误"); diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java index d366c60..74b667a 100644 --- a/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java @@ -22,6 +22,8 @@ public class BusiDsRequest implements Serializable { private Long pid; @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED) private String name; + @Schema(description = "应用ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String appId; @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED) private String nodeType; @Schema(description = "操作类型", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java index 764da6a..bf1524c 100644 --- a/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java @@ -20,7 +20,10 @@ public class DataVisualizationVO implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long id; - + /** + * 应用ID + */ + private String appId; /** * 名称 */ @@ -189,8 +192,9 @@ public class DataVisualizationVO implements Serializable { private VisualizationExport2AppVO appData; - public DataVisualizationVO(Long id, String name, String type, Integer version, String canvasStyleData, String componentData,String appDataStr, Map canvasViewInfo, Map extendDataInfo) { + public DataVisualizationVO(Long id,String appId, String name, String type, Integer version, String canvasStyleData, String componentData,String appDataStr, Map canvasViewInfo, Map extendDataInfo) { this.id = id; + this.appId = appId; this.name = name; this.type = type; this.canvasStyleData = canvasStyleData; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java index 11f68cd..4273959 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java @@ -23,6 +23,10 @@ public class DatasourceDTO implements Serializable { * 数据源名称 */ private String name; + /** + * 应用ID + */ + private String appId; /** * 描述