From fd4bafad30a4a68bf2442ee906d11703aa38da07 Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Mon, 23 Jun 2025 10:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/manage/DatasetSQLManage.java | 33 +++++++++---------- .../manage/DatasetTableFieldManage.java | 2 +- .../auto/entity/DataVisualizationInfo.java | 14 +++++++- .../manage/CoreVisualizationManage.java | 20 +++++------ .../manage/VisualizationStoreManage.java | 2 -- core/pom.xml | 1 - 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java index b244a41..7d93bfc 100644 --- a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java @@ -33,7 +33,6 @@ import io.gisbi.extensions.view.dto.ChartExtFilterDTO; import io.gisbi.extensions.view.dto.ChartExtRequest; import io.gisbi.extensions.view.dto.SqlVariableDetails; import io.gisbi.i18n.Translator; -import io.gisbi.license.utils.LicenseUtil; import io.gisbi.system.manage.CorePermissionManage; import io.gisbi.utils.AuthUtils; import io.gisbi.utils.BeanUtils; @@ -165,7 +164,7 @@ public class DatasetSQLManage { alias = f.getGisbiName(); } f.setFieldShortName(alias); - f.setgisbiName(f.getFieldShortName()); + f.setGisbiName(f.getFieldShortName()); f.setDatasetTableId(datasetTable.getId()); String prefix = ""; String suffix = ""; @@ -340,7 +339,7 @@ public class DatasetSQLManage { } f.setFieldShortName(alias); - f.setgisbiName(f.getFieldShortName()); + f.setGisbiName(f.getFieldShortName()); f.setDatasetTableId(datasetTable.getId()); String prefix = ""; String suffix = ""; @@ -411,21 +410,19 @@ public class DatasetSQLManage { BeanUtils.copyBean(dto, datasourceType); return dto; } else { - if (LicenseUtil.licenseValid()) { - List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); - List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList(); - if (ObjectUtils.isNotEmpty(list)) { - XpackPluginsDatasourceVO first = list.getFirst(); - DsTypeDTO dto = new DsTypeDTO(); - dto.setName(first.getName()); - dto.setCatalog(first.getCategory()); - dto.setType(first.getType()); - dto.setPrefix(first.getPrefix()); - dto.setSuffix(first.getSuffix()); - return dto; - } else { - DEException.throwException(Translator.get("i18n_dataset_plugin_error")); - } + List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); + List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList(); + if (ObjectUtils.isNotEmpty(list)) { + XpackPluginsDatasourceVO first = list.getFirst(); + DsTypeDTO dto = new DsTypeDTO(); + dto.setName(first.getName()); + dto.setCatalog(first.getCategory()); + dto.setType(first.getType()); + dto.setPrefix(first.getPrefix()); + dto.setSuffix(first.getSuffix()); + return dto; + } else { + DEException.throwException(Translator.get("i18n_dataset_plugin_error")); } return null; } diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java index eec4e19..e19a921 100644 --- a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java @@ -91,7 +91,7 @@ public class DatasetTableFieldManage { if (ObjectUtils.isEmpty(record.getGisbiName())) { String n = TableUtils.fieldNameShort(record.getId() + ""); record.setFieldShortName(n); - record.setgisbiName(n); + record.setGisbiName(n); } if (ObjectUtils.isEmpty(coreDatasetTableField)) { coreDatasetTableFieldMapper.insert(record); 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/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java index 4fb21cd..fc56756 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java @@ -13,7 +13,6 @@ import io.gisbi.commons.constants.OptConstants; import io.gisbi.constant.BusiResourceEnum; import io.gisbi.constant.CommonConstants; import io.gisbi.exception.DEException; -import io.gisbi.license.config.XpackInteract; import io.gisbi.model.BusiNodeRequest; import io.gisbi.model.BusiNodeVO; import io.gisbi.operation.manage.CoreOptRecentManage; @@ -70,7 +69,6 @@ public class CoreVisualizationManage { @Resource private ChartViewManege chartViewManege; - @XpackInteract(value = "visualizationResourceTree", replace = true, invalid = true) public List tree(BusiNodeRequest request) { List nodes = new ArrayList<>(); if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) { @@ -97,7 +95,7 @@ public class CoreVisualizationManage { return TreeUtils.mergeTree(nodes, BusiNodeVO.class, false); } - @XpackInteract(value = "visualizationResourceTree", before = false) + public void delete(Long id) { DataVisualizationInfo info = mapper.selectById(id); if (ObjectUtils.isEmpty(info)) { @@ -129,7 +127,7 @@ public class CoreVisualizationManage { coreOptRecentManage.saveOpt(id, OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.DELETE); } - @XpackInteract(value = "visualizationResourceTree", before = false) + public void move(DataVisualizationBaseRequest request) { if (!request.getMoveFromUpdate()) { DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); @@ -146,7 +144,7 @@ public class CoreVisualizationManage { } } - @XpackInteract(value = "visualizationResourceTree", before = false) + public Long innerSave(DataVisualizationInfo visualizationInfo) { visualizationInfo.setVersion(3); return preInnerSave(visualizationInfo); @@ -173,7 +171,7 @@ public class CoreVisualizationManage { return visualizationInfo.getId(); } - @XpackInteract(value = "visualizationResourceTree", before = false) + public void innerEdit(DataVisualizationInfo visualizationInfo) { // 镜像和主表保持名称一致 visualizationInfo.setUpdateTime(System.currentTimeMillis()); @@ -213,7 +211,7 @@ public class CoreVisualizationManage { return CommonBeanFactory.getBean(this.getClass()); } - @XpackInteract(value = "perFilterManage", recursion = true, invalid = true) + public IPage query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) { IPage visualizationResourcePOPageIPage = proxy().queryVisualizationPage(pageNum, pageSize, request); if (ObjectUtils.isEmpty(visualizationResourcePOPageIPage)) { @@ -275,7 +273,7 @@ public class CoreVisualizationManage { outerParamsMapper.deleteOuterParamsInfoWithVisualizationIdSnapshot(dvId.toString()); outerParamsMapper.deleteOuterParamsWithVisualizationIdSnapshot(dvId.toString()); //xpack 阈值告警 - chartViewManege.removeThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT); +// chartViewManege.removeThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT); } } @@ -296,7 +294,7 @@ public class CoreVisualizationManage { outerParamsMapper.deleteOuterParamsInfoWithVisualizationId(dvId.toString()); outerParamsMapper.deleteOuterParamsWithVisualizationId(dvId.toString()); //xpack 阈值告警 - chartViewManege.removeThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE); +// chartViewManege.removeThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE); } } @@ -318,7 +316,7 @@ public class CoreVisualizationManage { extDataVisualizationMapper.snapshotOuterParamsInfo(dvId); extDataVisualizationMapper.snapshotOuterParams(dvId); //xpack 阈值告警 - chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT); +// chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT); } @Transactional public void dvRestore(Long dvId){ @@ -333,7 +331,7 @@ public class CoreVisualizationManage { extDataVisualizationMapper.restoreOuterParamsInfo(dvId); extDataVisualizationMapper.restoreOuterParams(dvId); //xpack 阈值告警 - chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE); +// chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE); } } diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java index 858d69d..0b8a986 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java @@ -8,7 +8,6 @@ import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; import io.gisbi.api.visualization.vo.VisualizationStoreVO; import io.gisbi.constant.BusiResourceEnum; import io.gisbi.exception.DEException; -import io.gisbi.license.config.XpackInteract; import io.gisbi.utils.AuthUtils; import io.gisbi.utils.CommonBeanFactory; import io.gisbi.utils.CommunityUtils; @@ -66,7 +65,6 @@ public class VisualizationStoreManage { return coreStoreMapper.exists(queryWrapper); } - @XpackInteract(value = "perFilterManage", recursion = true, invalid = true) public IPage query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) { IPage storePOIPage = proxy().queryStorePage(pageNum, pageSize, request); if (ObjectUtils.isEmpty(storePOIPage)) return null; diff --git a/core/pom.xml b/core/pom.xml index 71f2e7a..b864150 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -12,7 +12,6 @@ core - core-frontend core-backend