diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java index 00636c65..07991db7 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java @@ -14,10 +14,13 @@ import java.util.List; @Data public class DataSetDataSource extends BaseChartDataSource { + @ApiModelProperty(notes = "数据来源,可能为数据集或者表达式") + private String source; + @ApiModelProperty(notes = "数据集标识") private String businessKey; - @ApiModelProperty(notes = "数据源标识,仅用于出码时使用") + @ApiModelProperty(notes = "数据源标识") private String dataSourceKey; @ApiModelProperty(notes = "数据集类型") diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json deleted file mode 100644 index 3eb4b757..00000000 --- a/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "success": false, - "data": [ - { - "sum(num)": 1456532 - } - ], - "columnData": { - "num": { - "type": "bigint", - "tableName": "", - "originalColumn": "num", - "aggregate": "sum", - "alias": "sum(num)", - "remark": "访问次数" - } - } -} \ No newline at end of file diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json new file mode 100644 index 00000000..26cac224 --- /dev/null +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json @@ -0,0 +1,18 @@ +{ + "success": false, + "data": [ + { + "title": 1234 + } + ], + "columnData": { + "title": { + "type": "varchar", + "tableName": "", + "originalColumn": "title", + "aggregate": "", + "alias": "title", + "remark": "标题" + } + } +} \ No newline at end of file diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json index f0d1fe97..a7283900 100644 --- a/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json @@ -6,7 +6,7 @@ } ], "columnData": { - "num": { + "title": { "type": "varchar", "tableName": "", "originalColumn": "title", diff --git a/doc/docker/application-docker.yml b/doc/docker/application-docker.yml index c8de8e54..7d491962 100644 --- a/doc/docker/application-docker.yml +++ b/doc/docker/application-docker.yml @@ -22,7 +22,10 @@ spring: url: jdbc:h2:file:/db/h2DBData # jdbc:h2:mem:test username: root password: ${DB_PASSWORD:123456} - schema: classpath:init-h2.sql + sql: + init: + schema-locations: classpath:init-h2.sql + mode: always gc: starter: file: