diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java index c0722be1..2647a91f 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java @@ -29,6 +29,10 @@ public class DataSetDto extends GaeaBaseDTO implements Serializable { /** 数据集描述 */ private String setDesc; + /** 数据集类型 */ + private String setType; + + /** 数据源编码 */ private String sourceCode; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java index 0cdca5c5..9730302e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java @@ -27,4 +27,8 @@ public class DataSetParam extends PageParam implements Serializable{ /** 数据源编码 */ @Query(QueryEnum.EQ) private String sourceCode; + + /** 数据集类型 */ + @Query(QueryEnum.EQ) + private String setType; } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java index 0bf50f18..8b131817 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java @@ -19,12 +19,14 @@ import java.util.List; public class DataSetTestTransformParam implements Serializable{ /** 数据源编码 */ - @NotBlank(message = "sourceCode not empty") private String sourceCode; /** 动态查询sql或者接口中的请求体 */ private String dynSentence; + /** 数据集类型 */ + private String setType; + /** 请求参数集合 */ private List dataSetParamDtoList; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java index dfebbb07..d9313b51 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java @@ -26,6 +26,9 @@ public class DataSet extends GaeaBaseEntity { @ApiModelProperty(value = "数据集描述") private String setDesc; + @ApiModelProperty(value = "数据集类型") + private String setType; + @ApiModelProperty(value = "数据源编码") private String sourceCode;