public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 02:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-v2' into pr@dev-v2@fixDS

Browse Source
This commit is contained in:
taojinlong
2024-08-23 09:48:18 +08:00
committed by GitHub
parent a1b1b78629 e308daa600
commit e95f1c7fee
66 changed files with 2352 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetGroupVO.java Normal file
View File

@@ -0,0 +1,94 @@
package io.dataease.api.dataset.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.dataease.api.chart.vo.ChartBaseVO;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@Data
public class CoreDatasetGroupVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 名称
*/
private String name;
/**
* 父级ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long pid;
/**
* 当前分组处于第几级
*/
private Integer level;
/**
* node类型：folder or dataset
*/
private String nodeType;
/**
* sql,union
*/
private String type;
/**
* 连接模式：0-直连，1-同步(包括excel、api等数据存在de中的表)
*/
private Integer mode;
/**
* 关联关系树
*/
private String info;
/**
* 创建人ID
*/
private String createBy;
/**
* 创建时间
*/
private Long createTime;
private String qrtzInstance;
/**
* 同步状态
*/
private String syncStatus;
/**
* 更新人ID
*/
private String updateBy;
/**
* 最后同步时间
*/
private Long lastUpdateTime;
/**
* 关联sql
*/
private String unionSql;
private List<CoreDatasetTableFieldVO> datasetFields = new ArrayList<>();
private List<ChartBaseVO> datasetViews = new ArrayList<>();
}

132
sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetTableFieldVO.java Normal file
View File

@@ -0,0 +1,132 @@
package io.dataease.api.dataset.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@NoArgsConstructor
public class CoreDatasetTableFieldVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 数据源ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long datasourceId;
/**
* 数据表ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long datasetTableId;
/**
* 数据集ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long datasetGroupId;
/**
* 图表ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long chartId;
/**
* 原始字段名
*/
private String originName;
/**
* 字段名用于展示
*/
private String name;
/**
* 描述
*/
private String description;
/**
* de字段名用作唯一标识
*/
private String dataeaseName;
/**
* de字段别名
*/
private String fieldShortName;
/**
* 维度/指标标识 d:维度，q:指标
*/
private String groupType;
/**
* 原始字段类型
*/
private String type;
private Integer size;
/**
* dataease字段类型：0-文本，1-时间，2-整型数值，3-浮点数值，4-布尔，5-地理位置，6-二进制
*/
private Integer deType;
/**
* de记录的原始类型
*/
private Integer deExtractType;
/**
* 是否扩展字段 0原始 1复制 2计算字段...
*/
private Integer extField;
/**
* 是否选中
*/
private Boolean checked;
/**
* 列位置
*/
private Integer columnIndex;
/**
* 同步时间
*/
private Long lastSyncTime;
/**
* 精度
*/
private Integer accuracy;
private String dateFormat;
/**
* 时间格式类型
*/
private String dateFormatType;
// 附加ID 兼容自定义参数ID
private String attachId;
public CoreDatasetTableFieldVO(String attachId, String name, Integer deType) {
this.attachId = attachId;
this.name = name;
this.deType = deType;
}
}

13
sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
View File

@@ -10,10 +10,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -66,4 +63,12 @@ public interface ThresholdApi {
@Operation(summary = "预览信息")
@PostMapping("/preview")
String preview(@RequestBody ThresholdPreviewRequest request);
@Operation(summary = "视图是否设置了阈值告警")
@GetMapping("/anyThreshold/{chartId}")
boolean anyThreshold(@PathVariable("chartId") Long chartId);
@Operation(summary = "根据视图ID删除")
@GetMapping("/deleteWithChart/{chartId}")
void deleteWithChart(@PathVariable("chartId") Long chartId);
}

9
sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java
View File

@@ -1,18 +1,27 @@
package io.dataease.api.visualization;
import io.dataease.api.dataset.vo.CoreDatasetGroupVO;
import io.dataease.api.visualization.dto.VisualizationOuterParamsDTO;
import io.dataease.api.visualization.response.VisualizationOuterParamsBaseResponse;
import org.springframework.web.bind.annotation.*;
import java.util.List;
public interface VisualizationOuterParamsApi {
@GetMapping("/queryWithVisualizationId/{dvId}")
VisualizationOuterParamsDTO queryWithVisualizationId(@PathVariable("dvId") String dvId);
@GetMapping("/queryWithVisualizationIdDS/{dvId}")
VisualizationOuterParamsDTO queryWithVisualizationIdDS(@PathVariable("dvId") String dvId);
@PostMapping("/updateOuterParamsSet")
void updateOuterParamsSet(@RequestBody VisualizationOuterParamsDTO OuterParamsDTO);
@GetMapping("/getOuterParamsInfo/{dvId}")
VisualizationOuterParamsBaseResponse getOuterParamsInfo(@PathVariable("dvId") String dvId);
@GetMapping("/queryDsWithVisualizationId/{dvId}")
List<CoreDatasetGroupVO> queryDsWithVisualizationId(@PathVariable("dvId") String dvId);
}

6
sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java
View File

@@ -1,5 +1,7 @@
package io.dataease.api.visualization.dto;
import io.dataease.api.visualization.vo.VisualizationOuterParamsDsInfoVO;
import io.dataease.api.visualization.vo.VisualizationOuterParamsFilterInfoVO;
import io.dataease.api.visualization.vo.VisualizationOuterParamsInfoVO;
import io.dataease.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO;
import lombok.Data;
@@ -20,4 +22,8 @@ public class VisualizationOuterParamsInfoDTO extends VisualizationOuterParamsInf
//目标联动参数 targetViewId#targetFieldId
private List<String> targetInfoList;
private List<VisualizationOuterParamsDsInfoVO> dsInfoVOList = new ArrayList<>();
private List<VisualizationOuterParamsFilterInfoVO> filterInfoVOList = new ArrayList<>();
}

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

@@ -0,0 +1,19 @@
package io.dataease.api.visualization.vo;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class VisualizationOuterParamsDsInfoVO {
private String dsName;
private String dsId;
private List targetFieldInfo;
private Map<String,Boolean> viewCheckedInfo;
}

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

@@ -0,0 +1,15 @@
package io.dataease.api.visualization.vo;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class VisualizationOuterParamsFilterInfoVO {
private String filterComponentId;
private String filterId;
}

68
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java
View File

@@ -1,6 +1,6 @@
package io.dataease.api.visualization.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -12,6 +12,7 @@ import java.io.Serializable;
* @author fit2cloud
* @since 2024-03-08
*/
@Data
public class VisualizationOuterParamsTargetViewInfoVO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,6 +32,11 @@ public class VisualizationOuterParamsTargetViewInfoVO implements Serializable {
*/
private String targetViewId;
/**
* 联动数据集id/联动过滤组件id
*/
private String targetDsId;
/**
* 联动字段ID
*/
@@ -45,64 +51,4 @@ public class VisualizationOuterParamsTargetViewInfoVO implements Serializable {
* 复制来源ID
*/
private String copyId;
public String getTargetId() {
return targetId;
}
public void setTargetId(String targetId) {
this.targetId = targetId;
}
public String getParamsInfoId() {
return paramsInfoId;
}
public void setParamsInfoId(String paramsInfoId) {
this.paramsInfoId = paramsInfoId;
}
public String getTargetViewId() {
return targetViewId;
}
public void setTargetViewId(String targetViewId) {
this.targetViewId = targetViewId;
}
public String getTargetFieldId() {
return targetFieldId;
}
public void setTargetFieldId(String targetFieldId) {
this.targetFieldId = targetFieldId;
}
public String getCopyFrom() {
return copyFrom;
}
public void setCopyFrom(String copyFrom) {
this.copyFrom = copyFrom;
}
public String getCopyId() {
return copyId;
}
public void setCopyId(String copyId) {
this.copyId = copyId;
}
@Override
public String toString() {
return "VisualizationOuterParamsTargetViewInfo{" +
"targetId = " + targetId +
", paramsInfoId = " + paramsInfoId +
", targetViewId = " + targetViewId +
", targetFieldId = " + targetFieldId +
", copyFrom = " + copyFrom +
", copyId = " + copyId +
"}";
}
}

4
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java
View File

@@ -80,8 +80,8 @@ public interface DataFillingApi {
@PostMapping("/task/logMsg")
String logMsg(@RequestBody ReportInstanceMsgRequest request);
@PostMapping("/task/page/{goPage}/{pageSize}")
IPage<ReportGridVO> taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfTaskInfoRequest request);
@PostMapping("/form/{formId}/task/page/{goPage}/{pageSize}")
IPage<ReportGridVO> taskPager(@PathVariable("formId") Long formId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfTaskInfoRequest request);
@PostMapping("/sub-task/page/{goPage}/{pageSize}")
IPage<DfSubTaskVo> subTaskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfSubTaskInfoRequest request);