ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正了错误

Browse Source
This commit is contained in:
root 2025-06-23 10:57:50 +08:00
parent a678c15c11
commit fd4bafad30
6 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java
View File

@ -33,7 +33,6 @@ import io.gisbi.extensions.view.dto.ChartExtFilterDTO;
import io.gisbi.extensions.view.dto.ChartExtRequest; import io.gisbi.extensions.view.dto.ChartExtRequest;
import io.gisbi.extensions.view.dto.SqlVariableDetails; import io.gisbi.extensions.view.dto.SqlVariableDetails;
import io.gisbi.i18n.Translator; import io.gisbi.i18n.Translator;
import io.gisbi.license.utils.LicenseUtil;
import io.gisbi.system.manage.CorePermissionManage; import io.gisbi.system.manage.CorePermissionManage;
import io.gisbi.utils.AuthUtils; import io.gisbi.utils.AuthUtils;
import io.gisbi.utils.BeanUtils; import io.gisbi.utils.BeanUtils;
@ -165,7 +164,7 @@ public class DatasetSQLManage {
alias = f.getGisbiName(); alias = f.getGisbiName();
} }
f.setFieldShortName(alias); f.setFieldShortName(alias);
f.setgisbiName(f.getFieldShortName()); f.setGisbiName(f.getFieldShortName());
f.setDatasetTableId(datasetTable.getId()); f.setDatasetTableId(datasetTable.getId());
String prefix = ""; String prefix = "";
String suffix = ""; String suffix = "";
@ -340,7 +339,7 @@ public class DatasetSQLManage {
} }
f.setFieldShortName(alias); f.setFieldShortName(alias);
f.setgisbiName(f.getFieldShortName()); f.setGisbiName(f.getFieldShortName());
f.setDatasetTableId(datasetTable.getId()); f.setDatasetTableId(datasetTable.getId());
String prefix = ""; String prefix = "";
String suffix = ""; String suffix = "";
@ -411,21 +410,19 @@ public class DatasetSQLManage {
BeanUtils.copyBean(dto, datasourceType); BeanUtils.copyBean(dto, datasourceType);
return dto; return dto;
} else { } else {
if (LicenseUtil.licenseValid()) { List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
List<XpackPluginsDatasourceVO> xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); List<XpackPluginsDatasourceVO> list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList();
List<XpackPluginsDatasourceVO> list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList(); if (ObjectUtils.isNotEmpty(list)) {
if (ObjectUtils.isNotEmpty(list)) { XpackPluginsDatasourceVO first = list.getFirst();
XpackPluginsDatasourceVO first = list.getFirst(); DsTypeDTO dto = new DsTypeDTO();
DsTypeDTO dto = new DsTypeDTO(); dto.setName(first.getName());
dto.setName(first.getName()); dto.setCatalog(first.getCategory());
dto.setCatalog(first.getCategory()); dto.setType(first.getType());
dto.setType(first.getType()); dto.setPrefix(first.getPrefix());
dto.setPrefix(first.getPrefix()); dto.setSuffix(first.getSuffix());
dto.setSuffix(first.getSuffix()); return dto;
return dto; } else {
} else { DEException.throwException(Translator.get("i18n_dataset_plugin_error"));
DEException.throwException(Translator.get("i18n_dataset_plugin_error"));
}
} }
return null; return null;
} }

2
core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java
View File

@ -91,7 +91,7 @@ public class DatasetTableFieldManage {
if (ObjectUtils.isEmpty(record.getGisbiName())) { if (ObjectUtils.isEmpty(record.getGisbiName())) {
String n = TableUtils.fieldNameShort(record.getId() + ""); String n = TableUtils.fieldNameShort(record.getId() + "");
record.setFieldShortName(n); record.setFieldShortName(n);
record.setgisbiName(n); record.setGisbiName(n);
} }
if (ObjectUtils.isEmpty(coreDatasetTableField)) { if (ObjectUtils.isEmpty(coreDatasetTableField)) {
coreDatasetTableFieldMapper.insert(record); coreDatasetTableFieldMapper.insert(record);

14
core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java
View File

@ -17,7 +17,10 @@ public class DataVisualizationInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Long id; private Long id;
/**
* 应用ID
*/
private String appId;
/** /**
* 名称 * 名称
*/ */
@ -342,6 +345,7 @@ public class DataVisualizationInfo implements Serializable {
public String toString() { public String toString() {
return "DataVisualizationInfo{" + return "DataVisualizationInfo{" +
"id = " + id + "id = " + id +
", appId = " + appId +
", name = " + name + ", name = " + name +
", pid = " + pid + ", pid = " + pid +
", orgId = " + orgId + ", orgId = " + orgId +
@ -368,4 +372,12 @@ public class DataVisualizationInfo implements Serializable {
", checkVersion = " + checkVersion + ", checkVersion = " + checkVersion +
"}"; "}";
} }
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
} }

20
core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java
View File

@ -13,7 +13,6 @@ import io.gisbi.commons.constants.OptConstants;
import io.gisbi.constant.BusiResourceEnum; import io.gisbi.constant.BusiResourceEnum;
import io.gisbi.constant.CommonConstants; import io.gisbi.constant.CommonConstants;
import io.gisbi.exception.DEException; import io.gisbi.exception.DEException;
import io.gisbi.license.config.XpackInteract;
import io.gisbi.model.BusiNodeRequest; import io.gisbi.model.BusiNodeRequest;
import io.gisbi.model.BusiNodeVO; import io.gisbi.model.BusiNodeVO;
import io.gisbi.operation.manage.CoreOptRecentManage; import io.gisbi.operation.manage.CoreOptRecentManage;
@ -70,7 +69,6 @@ public class CoreVisualizationManage {
@Resource @Resource
private ChartViewManege chartViewManege; private ChartViewManege chartViewManege;
@XpackInteract(value = "visualizationResourceTree", replace = true, invalid = true)
public List<BusiNodeVO> tree(BusiNodeRequest request) { public List<BusiNodeVO> tree(BusiNodeRequest request) {
List<VisualizationNodeBO> nodes = new ArrayList<>(); List<VisualizationNodeBO> nodes = new ArrayList<>();
if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) { if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) {
@ -97,7 +95,7 @@ public class CoreVisualizationManage {
return TreeUtils.mergeTree(nodes, BusiNodeVO.class, false); return TreeUtils.mergeTree(nodes, BusiNodeVO.class, false);
} }
@XpackInteract(value = "visualizationResourceTree", before = false)
public void delete(Long id) { public void delete(Long id) {
DataVisualizationInfo info = mapper.selectById(id); DataVisualizationInfo info = mapper.selectById(id);
if (ObjectUtils.isEmpty(info)) { if (ObjectUtils.isEmpty(info)) {
@ -129,7 +127,7 @@ public class CoreVisualizationManage {
coreOptRecentManage.saveOpt(id, OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.DELETE); coreOptRecentManage.saveOpt(id, OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.DELETE);
} }
@XpackInteract(value = "visualizationResourceTree", before = false)
public void move(DataVisualizationBaseRequest request) { public void move(DataVisualizationBaseRequest request) {
if (!request.getMoveFromUpdate()) { if (!request.getMoveFromUpdate()) {
DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); DataVisualizationInfo visualizationInfo = new DataVisualizationInfo();
@ -146,7 +144,7 @@ public class CoreVisualizationManage {
} }
} }
@XpackInteract(value = "visualizationResourceTree", before = false)
public Long innerSave(DataVisualizationInfo visualizationInfo) { public Long innerSave(DataVisualizationInfo visualizationInfo) {
visualizationInfo.setVersion(3); visualizationInfo.setVersion(3);
return preInnerSave(visualizationInfo); return preInnerSave(visualizationInfo);
@ -173,7 +171,7 @@ public class CoreVisualizationManage {
return visualizationInfo.getId(); return visualizationInfo.getId();
} }
@XpackInteract(value = "visualizationResourceTree", before = false)
public void innerEdit(DataVisualizationInfo visualizationInfo) { public void innerEdit(DataVisualizationInfo visualizationInfo) {
// 镜像和主表保持名称一致 // 镜像和主表保持名称一致
visualizationInfo.setUpdateTime(System.currentTimeMillis()); visualizationInfo.setUpdateTime(System.currentTimeMillis());
@ -213,7 +211,7 @@ public class CoreVisualizationManage {
return CommonBeanFactory.getBean(this.getClass()); return CommonBeanFactory.getBean(this.getClass());
} }
@XpackInteract(value = "perFilterManage", recursion = true, invalid = true)
public IPage<VisualizationResourceVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) { public IPage<VisualizationResourceVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) {
IPage<VisualizationResourcePO> visualizationResourcePOPageIPage = proxy().queryVisualizationPage(pageNum, pageSize, request); IPage<VisualizationResourcePO> visualizationResourcePOPageIPage = proxy().queryVisualizationPage(pageNum, pageSize, request);
if (ObjectUtils.isEmpty(visualizationResourcePOPageIPage)) { if (ObjectUtils.isEmpty(visualizationResourcePOPageIPage)) {
@ -275,7 +273,7 @@ public class CoreVisualizationManage {
outerParamsMapper.deleteOuterParamsInfoWithVisualizationIdSnapshot(dvId.toString()); outerParamsMapper.deleteOuterParamsInfoWithVisualizationIdSnapshot(dvId.toString());
outerParamsMapper.deleteOuterParamsWithVisualizationIdSnapshot(dvId.toString()); outerParamsMapper.deleteOuterParamsWithVisualizationIdSnapshot(dvId.toString());
//xpack 阈值告警 //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.deleteOuterParamsInfoWithVisualizationId(dvId.toString());
outerParamsMapper.deleteOuterParamsWithVisualizationId(dvId.toString()); outerParamsMapper.deleteOuterParamsWithVisualizationId(dvId.toString());
//xpack 阈值告警 //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.snapshotOuterParamsInfo(dvId);
extDataVisualizationMapper.snapshotOuterParams(dvId); extDataVisualizationMapper.snapshotOuterParams(dvId);
//xpack 阈值告警 //xpack 阈值告警
chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT); // chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.SNAPSHOT);
} }
@Transactional @Transactional
public void dvRestore(Long dvId){ public void dvRestore(Long dvId){
@ -333,7 +331,7 @@ public class CoreVisualizationManage {
extDataVisualizationMapper.restoreOuterParamsInfo(dvId); extDataVisualizationMapper.restoreOuterParamsInfo(dvId);
extDataVisualizationMapper.restoreOuterParams(dvId); extDataVisualizationMapper.restoreOuterParams(dvId);
//xpack 阈值告警 //xpack 阈值告警
chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE); // chartViewManege.restoreThreshold(dvId,CommonConstants.RESOURCE_TABLE.CORE);
} }
} }

2
core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java
View File

@ -8,7 +8,6 @@ import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest;
import io.gisbi.api.visualization.vo.VisualizationStoreVO; import io.gisbi.api.visualization.vo.VisualizationStoreVO;
import io.gisbi.constant.BusiResourceEnum; import io.gisbi.constant.BusiResourceEnum;
import io.gisbi.exception.DEException; import io.gisbi.exception.DEException;
import io.gisbi.license.config.XpackInteract;
import io.gisbi.utils.AuthUtils; import io.gisbi.utils.AuthUtils;
import io.gisbi.utils.CommonBeanFactory; import io.gisbi.utils.CommonBeanFactory;
import io.gisbi.utils.CommunityUtils; import io.gisbi.utils.CommunityUtils;
@ -66,7 +65,6 @@ public class VisualizationStoreManage {
return coreStoreMapper.exists(queryWrapper); return coreStoreMapper.exists(queryWrapper);
} }
@XpackInteract(value = "perFilterManage", recursion = true, invalid = true)
public IPage<VisualizationStoreVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) { public IPage<VisualizationStoreVO> query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) {
IPage<StorePO> storePOIPage = proxy().queryStorePage(pageNum, pageSize, request); IPage<StorePO> storePOIPage = proxy().queryStorePage(pageNum, pageSize, request);
if (ObjectUtils.isEmpty(storePOIPage)) return null; if (ObjectUtils.isEmpty(storePOIPage)) return null;

1
core/pom.xml
View File

@ -12,7 +12,6 @@
<artifactId>core</artifactId> <artifactId>core</artifactId>
<modules> <modules>
<module>core-frontend</module>
<module>core-backend</module> <module>core-backend</module>
</modules> </modules>