public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-22 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(X-Pack): 新增LDAP认证

Browse Source
This commit is contained in:
fit2cloud-chenyw
2024-07-18 14:56:09 +08:00
parent bd0d7a9cdc be67c69bb7
commit 0ce521ef0f
62 changed files with 1590 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java
View File

@@ -46,7 +46,7 @@ public interface DataVisualizationApi {
@PostMapping("/saveCanvas")
@DePermit(value = {"#p0.pid + ':manage'"}, busiFlag = "#p0.type")
@Operation(summary = "画布保存")
String saveCanvas(@RequestBody DataVisualizationBaseRequest request);
String saveCanvas(@RequestBody DataVisualizationBaseRequest request) throws Exception;
@PostMapping("/updateCanvas")
@DePermit(value = {"#p0.id + ':manage'"}, busiFlag = "#p0.type")

12
sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java
View File

@@ -1,6 +1,9 @@
package io.dataease.api.visualization.request;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.dataease.api.visualization.vo.DataVisualizationVO;
import io.dataease.api.visualization.vo.VisualizationExport2AppVO;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -32,11 +35,20 @@ public class DataVisualizationBaseRequest extends DataVisualizationVO {
private String source;
// 定时报告id
@JsonSerialize(using = ToStringSerializer.class)
private Long reportId;
// 定时报告任务id
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@JsonSerialize(using = ToStringSerializer.class)
// 数据集分组PID
private Long datasetFolderPid;
// 数据集分组名称
private String datasetFolderName;
public DataVisualizationBaseRequest(Long id,String busiFlag) {
this.busiFlag = busiFlag;

5
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceVO.java
View File

@@ -79,4 +79,9 @@ public class AppCoreDatasourceVO implements Serializable {
*/
private String taskStatus;
/**
* 映射系统数据源ID
*/
private Long systemDatasourceId;
}

13
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java
View File

@@ -2,10 +2,13 @@ package io.dataease.api.visualization.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.google.gson.Gson;
import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
import io.dataease.extensions.view.dto.ChartViewDTO;
import io.dataease.utils.JsonUtil;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.HashMap;
@@ -156,7 +159,7 @@ public class DataVisualizationVO implements Serializable {
/**
* 定时报告自定义过滤数据
*/
private Map<Long,VisualizationReportFilterVO> reportFilterInfo = new HashMap<>();
private Map<Long, VisualizationReportFilterVO> reportFilterInfo = new HashMap<>();
/**
* 水印信息
@@ -171,10 +174,10 @@ public class DataVisualizationVO implements Serializable {
/**
* 应用信息
*/
private String appData;
private VisualizationExport2AppVO appData;
public DataVisualizationVO(Long id, String name, String type, Integer version, String canvasStyleData, String componentData,String appData, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
public DataVisualizationVO(Long id, String name, String type, Integer version, String canvasStyleData, String componentData,String appDataStr, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
this.id = id;
this.name = name;
this.type = type;
@@ -182,7 +185,9 @@ public class DataVisualizationVO implements Serializable {
this.componentData = componentData;
this.canvasViewInfo = canvasViewInfo;
this.extendDataInfo = extendDataInfo;
this.appData = appData;
if(StringUtils.isNotEmpty(appDataStr)){
this.appData= JsonUtil.parseObject(appDataStr,VisualizationExport2AppVO.class);
}
this.version = version;
}
}

48
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBaseInfoVO.java Normal file
View File

@@ -0,0 +1,48 @@
package io.dataease.api.visualization.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
@Data
public class VisualizationBaseInfoVO {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String name;
private String label;
private String nodeType;
@JsonSerialize(using = ToStringSerializer.class)
private Long pid;
/**
* 移动端布局
*/
private String mobileLayout;
/**
* 创建时间
*/
private Long createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
private Long updateTime;
/**
* 更新人
*/
private String updateBy;
}

47
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationExport2AppVO.java
View File

@@ -1,6 +1,7 @@
package io.dataease.api.visualization.vo;
import com.google.gson.Gson;
import io.dataease.api.visualization.request.DataVisualizationBaseRequest;
import lombok.Data;
import java.util.ArrayList;
@@ -17,27 +18,27 @@ public class VisualizationExport2AppVO {
private String visualizationViewsInfo;
private String chartViewsInfo;
List<AppCoreChartViewVO> chartViewsInfo;
private String datasetGroupsInfo;
List<AppCoreDatasetGroupVO> datasetGroupsInfo;
private String datasetTablesInfo;
List<AppCoreDatasetTableVO> datasetTablesInfo;
private String datasetTableFieldsInfo;
List<AppCoreDatasetTableFieldVO> datasetTableFieldsInfo;
private String datasourceInfo;
List<AppCoreDatasourceVO> datasourceInfo;
private String datasourceTaskInfo;
List<AppCoreDatasourceTaskVO> datasourceTaskInfo;
private String linkJumps;
List<VisualizationLinkJumpVO> linkJumps;
private String linkJumpInfos;
List<VisualizationLinkJumpInfoVO> linkJumpInfos;
private String linkJumpTargetInfos;
List<VisualizationLinkJumpTargetViewInfoVO> linkJumpTargetInfos;
private String linkages;
List<VisualizationLinkageVO> linkages;
private String linkageFields;
List<VisualizationLinkageFieldVO> linkageFields;
public VisualizationExport2AppVO() {
@@ -58,20 +59,18 @@ public class VisualizationExport2AppVO {
List<VisualizationLinkJumpTargetViewInfoVO> linkJumpTargetViewVOInfo,
List<VisualizationLinkageVO> linkagesVOInfo,
List<VisualizationLinkageFieldVO> linkageFieldVOInfo) {
List<Object> empty = new ArrayList<>();
Gson gson = new Gson();
this.checkStatus = true;
this.checkMes = "success";
this.chartViewsInfo = gson.toJson(chartViewVOInfo != null ? chartViewVOInfo : empty);
this.datasetGroupsInfo = gson.toJson(datasetGroupVOInfo != null ? datasetGroupVOInfo : empty);
this.datasetTablesInfo = gson.toJson(datasetTableVOInfo != null ? datasetTableVOInfo : empty);
this.datasetTableFieldsInfo = gson.toJson(datasetTableFieldVOInfo != null ? datasetTableFieldVOInfo : empty);
this.datasourceTaskInfo = gson.toJson(datasourceTaskVOInfo != null ? datasourceTaskVOInfo : empty);
this.datasourceInfo = gson.toJson(datasourceVOInfo != null ? datasourceVOInfo : empty);
this.linkJumps = gson.toJson(linkJumpVOInfo != null ? linkJumpVOInfo : empty);
this.linkJumpInfos = gson.toJson(linkJumpInfoVOInfo != null ? linkJumpInfoVOInfo : empty);
this.linkJumpTargetInfos = gson.toJson(linkJumpTargetViewVOInfo != null ? linkJumpTargetViewVOInfo : empty);
this.linkages = gson.toJson(linkagesVOInfo != null ? linkagesVOInfo : empty);
this.linkageFields = gson.toJson(linkageFieldVOInfo != null ? linkageFieldVOInfo : empty);
this.chartViewsInfo = chartViewVOInfo != null ? chartViewVOInfo : new ArrayList<>();
this.datasetGroupsInfo = datasetGroupVOInfo != null ? datasetGroupVOInfo : new ArrayList<>();
this.datasetTablesInfo = datasetTableVOInfo != null ? datasetTableVOInfo : new ArrayList<>();
this.datasetTableFieldsInfo = datasetTableFieldVOInfo != null ? datasetTableFieldVOInfo : new ArrayList<>();
this.datasourceTaskInfo = datasourceTaskVOInfo != null ? datasourceTaskVOInfo : new ArrayList<>();
this.datasourceInfo = datasourceVOInfo != null ? datasourceVOInfo : new ArrayList<>();
this.linkJumps = linkJumpVOInfo != null ? linkJumpVOInfo : new ArrayList<>();
this.linkJumpInfos = linkJumpInfoVOInfo != null ? linkJumpInfoVOInfo : new ArrayList<>();
this.linkJumpTargetInfos = linkJumpTargetViewVOInfo != null ? linkJumpTargetViewVOInfo : new ArrayList<>();
this.linkages = linkagesVOInfo != null ? linkagesVOInfo : new ArrayList<>();
this.linkageFields = linkageFieldVOInfo != null ? linkageFieldVOInfo : new ArrayList<>();
}
}