refactor: 模版市场优化

This commit is contained in:
wangjiahao
2023-11-13 15:01:39 +08:00
parent c0f201c599
commit e636ead79f
10 changed files with 432 additions and 9 deletions

View File

@@ -0,0 +1,26 @@
package io.dataease.api.template.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.dataease.api.template.vo.VisualizationTemplateExtendDataVO;
import io.dataease.utils.IDUtils;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author : WangJiaHao
* @date : 2023/11/13 10:25
*/
@Data
@NoArgsConstructor
public class VisualizationTemplateExtendDataDTO extends VisualizationTemplateExtendDataVO {
public VisualizationTemplateExtendDataDTO(Long dvId, Long viewId, String viewDetails) {
super();
super.setId(IDUtils.snowID());
super.setDvId(dvId);
super.setViewId(viewId);
super.setViewDetails(viewDetails);
}
}

View File

@@ -0,0 +1,26 @@
package io.dataease.api.template.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
/**
* @author : WangJiaHao
* @date : 2023/11/13 10:25
*/
@Data
public class VisualizationTemplateExtendDataVO {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@JsonSerialize(using = ToStringSerializer.class)
private Long dvId;
@JsonSerialize(using = ToStringSerializer.class)
private Long viewId;
private String viewDetails;
private String copyFrom;
private String copyId;
}

View File

@@ -3,6 +3,7 @@ package io.dataease.api.visualization.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.dataease.api.chart.dto.ChartViewDTO;
import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,7 +14,7 @@ import java.util.Map;
@Data
@NoArgsConstructor
public class DataVisualizationVO implements Serializable {
public class DataVisualizationVO implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@@ -121,14 +122,20 @@ public class DataVisualizationVO implements Serializable {
/**
* 视图基本信息
*/
private Map<Long,ChartViewDTO> canvasViewInfo = new HashMap<>();
private Map<Long, ChartViewDTO> canvasViewInfo = new HashMap<>();
public DataVisualizationVO(Long id, String name, String type, String canvasStyleData, String componentData, Map<Long,ChartViewDTO> canvasViewInfo) {
/**
* 视图模版数据
*/
private Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo = new HashMap<>();
public DataVisualizationVO(Long id, String name, String type, String canvasStyleData, String componentData, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
this.id = id;
this.name = name;
this.type = type;
this.canvasStyleData = canvasStyleData;
this.componentData = componentData;
this.canvasViewInfo = canvasViewInfo;
this.extendDataInfo = extendDataInfo;
}
}