mirror of
https://github.com/dataease/dataease.git
synced 2026-05-15 05:22:13 +08:00
refactor(图表): 视图统一定义为图表
This commit is contained in:
@@ -16,10 +16,10 @@ import java.util.List;
|
||||
/**
|
||||
* @Author Junjun
|
||||
*/
|
||||
@Tag(name = "视图管理:数据")
|
||||
@Tag(name = "图表管理:数据")
|
||||
@ApiSupport(order = 989)
|
||||
public interface ChartDataApi {
|
||||
@Operation(summary = "获取视图数据")
|
||||
@Operation(summary = "获取图表数据")
|
||||
@PostMapping("getData")
|
||||
ChartViewDTO getData(@RequestBody ChartViewDTO chartViewDTO) throws Exception;
|
||||
|
||||
|
||||
@@ -16,18 +16,18 @@ import java.util.Map;
|
||||
/**
|
||||
* @Author Junjun
|
||||
*/
|
||||
@Tag(name = "视图管理:查看")
|
||||
@Tag(name = "图表管理:查看")
|
||||
@ApiSupport(order = 988)
|
||||
public interface ChartViewApi {
|
||||
@Operation(summary = "查询视图详情并同时计算数据", hidden = true)
|
||||
@Operation(summary = "查询图表详情并同时计算数据", hidden = true)
|
||||
@PostMapping("getChart/{id}")
|
||||
ChartViewDTO getData(@PathVariable Long id) throws Exception;
|
||||
|
||||
@Operation(summary = "获取视图字段")
|
||||
@Operation(summary = "获取图表字段")
|
||||
@PostMapping("listByDQ/{id}/{chartId}")
|
||||
Map<String, List<ChartViewFieldDTO>> listByDQ(@PathVariable Long id, @PathVariable Long chartId);
|
||||
|
||||
@Operation(summary = "保存视图")
|
||||
@Operation(summary = "保存图表")
|
||||
@PostMapping("save")
|
||||
ChartViewDTO save(@RequestBody ChartViewDTO dto) throws Exception;
|
||||
|
||||
@@ -35,7 +35,7 @@ public interface ChartViewApi {
|
||||
@GetMapping("/checkSameDataSet/{viewIdSource}/{viewIdTarget}")
|
||||
String checkSameDataSet(@PathVariable String viewIdSource, @PathVariable String viewIdTarget);
|
||||
|
||||
@Operation(summary = "查询视图详情")
|
||||
@Operation(summary = "查询图表详情")
|
||||
@PostMapping("getDetail/{id}")
|
||||
ChartViewDTO getDetail(@PathVariable Long id);
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ public class ChartViewBaseDTO implements Serializable {
|
||||
private String stylePriority;
|
||||
|
||||
/**
|
||||
* 图表类型 public 公共 历史可复用的视图,private 私有 专属某个仪表板
|
||||
* 图表类型 public 公共 历史可复用的图表,private 私有 专属某个仪表板
|
||||
*/
|
||||
private String chartType;
|
||||
|
||||
@@ -173,7 +173,7 @@ public class ChartViewBaseDTO implements Serializable {
|
||||
private String dataFrom;
|
||||
|
||||
/**
|
||||
* 视图字段集合
|
||||
* 图表字段集合
|
||||
*/
|
||||
private List<ChartViewFieldDTO> viewFields;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 视图字段base类,与数据集字段表基本一致
|
||||
* 图表字段base类,与数据集字段表基本一致
|
||||
*/
|
||||
@Data
|
||||
public class ChartViewFieldBaseDTO extends DatasetTableFieldDTO implements Serializable {
|
||||
|
||||
@@ -22,7 +22,7 @@ import java.util.Map;
|
||||
public interface DatasetTableApi {
|
||||
|
||||
/**
|
||||
* 该接口用于视图计算字段单独保存
|
||||
* 该接口用于图表计算字段单独保存
|
||||
*
|
||||
* @param datasetTableFieldDTO
|
||||
* @return
|
||||
@@ -60,7 +60,7 @@ public interface DatasetTableApi {
|
||||
@PostMapping("getFunction")
|
||||
List<SQLFunctionDTO> getFunction();
|
||||
|
||||
@Operation(summary = "删除视图计算字段", hidden = true)
|
||||
@Operation(summary = "删除图表计算字段", hidden = true)
|
||||
@PostMapping("deleteByChartId/{id}")
|
||||
void deleteByChartId(@PathVariable Long id);
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class SQLMeta {
|
||||
private List<SQLObj> yOrders;
|
||||
|
||||
/**
|
||||
* 视图过滤字段
|
||||
* 图表过滤字段
|
||||
*/
|
||||
private String customWheres;
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ public interface VisualizationLinkJumpApi {
|
||||
List<DatasetTableFieldDTO> getTableFieldWithViewId(@PathVariable Long viewId);
|
||||
|
||||
@GetMapping("/queryWithViewId/{dvId}/{viewId}")
|
||||
@Operation(summary = "根据视图ID查询跳转信息")
|
||||
@Operation(summary = "根据图表ID查询跳转信息")
|
||||
VisualizationLinkJumpDTO queryWithViewId(@PathVariable Long dvId, @PathVariable Long viewId);
|
||||
|
||||
@GetMapping("/queryVisualizationJumpInfo/{dvId}")
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.util.Map;
|
||||
*/
|
||||
@Data
|
||||
public class VisualizationLinkJumpDTO extends VisualizationLinkJumpVO {
|
||||
//仪表板可以跳转视图信息 sourceViewId#
|
||||
//仪表板可以跳转图表信息 sourceViewId#
|
||||
private String sourceInfo;
|
||||
|
||||
private List<String> targetInfoList;
|
||||
|
||||
@@ -18,12 +18,12 @@ import java.util.List;
|
||||
public class VisualizationLinkageDTO extends VisualizationLinkageVO {
|
||||
|
||||
/**
|
||||
* 目标视图名称
|
||||
* 目标图表名称
|
||||
*/
|
||||
private String targetViewName;
|
||||
|
||||
/**
|
||||
* 目标视图类型
|
||||
* 目标图表类型
|
||||
*/
|
||||
private String targetViewType;
|
||||
/**
|
||||
@@ -32,7 +32,7 @@ public class VisualizationLinkageDTO extends VisualizationLinkageVO {
|
||||
private List<VisualizationLinkageFieldVO> linkageFields = new ArrayList<>();
|
||||
|
||||
/**
|
||||
* 目标视图字段
|
||||
* 目标图表字段
|
||||
*/
|
||||
private List<DatasetTableFieldDTO> targetViewFields = new ArrayList<>();
|
||||
/**
|
||||
|
||||
@@ -120,12 +120,12 @@ public class DataVisualizationVO implements Serializable {
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 视图基本信息
|
||||
* 图表基本信息
|
||||
*/
|
||||
private Map<Long, ChartViewDTO> canvasViewInfo = new HashMap<>();
|
||||
|
||||
/**
|
||||
* 视图模板数据
|
||||
* 图表模板数据
|
||||
*/
|
||||
private Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo = new HashMap<>();
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class VisualizationLinkJumpVO {
|
||||
private Long sourceDvId;
|
||||
|
||||
/**
|
||||
* 源视图ID
|
||||
* 源图表ID
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sourceViewId;
|
||||
|
||||
@@ -20,13 +20,13 @@ public class VisualizationLinkageFieldVO implements Serializable {
|
||||
private Long linkageId;
|
||||
|
||||
/**
|
||||
* 源视图字段
|
||||
* 源图表字段
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sourceField;
|
||||
|
||||
/**
|
||||
* 目标视图字段
|
||||
* 目标图表字段
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long targetField;
|
||||
|
||||
@@ -16,13 +16,13 @@ public class VisualizationLinkageVO implements Serializable {
|
||||
private Long dvId;
|
||||
|
||||
/**
|
||||
* 源视图id
|
||||
* 源图表id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sourceViewId;
|
||||
|
||||
/**
|
||||
* 联动视图id
|
||||
* 联动图表id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long targetViewId;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class VisualizationViewTableVO {
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 视图渲染方式
|
||||
* 图表渲染方式
|
||||
*/
|
||||
private String render;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user