center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4967 from dataease/pr@dev@feat_chart_date

Browse Source 
feat(视图): Doris,StarRocks同环比支持周，季度
This commit is contained in:
Junjun 2023-04-06 10:09:17 +08:00 committed by GitHub
commit 6a7e597c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1392 additions and 1363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -1155,8 +1155,12 @@ public class DorisQueryProvider extends QueryProvider {
switch (dateStyle) { switch (dateStyle) {
case "y": case "y":
return "%Y"; return "%Y";
case "y_Q":
return "CONCAT(%s,'" + split + "',%s)";
case "y_M": case "y_M":
return "%Y" + split + "%m"; return "%Y" + split + "%m";
case "y_W":
return "%Y" + split + "%u";
case "y_M_d": case "y_M_d":
return "%Y" + split + "%m" + split + "%d"; return "%Y" + split + "%m" + split + "%d";
case "H_m_s": case "H_m_s":
@ -1177,7 +1181,13 @@ public class DorisQueryProvider extends QueryProvider {
fieldName = String.format(DorisConstants.UNIX_TIMESTAMP, originField) + "*1000"; fieldName = String.format(DorisConstants.UNIX_TIMESTAMP, originField) + "*1000";
} else if (x.getDeType() == 1) { } else if (x.getDeType() == 1) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
fieldName = String.format(DorisConstants.DATE_FORMAT, originField, format); if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(DorisConstants.DATE_FORMAT, originField, "%Y"),
String.format(DorisConstants.QUARTER, originField));
} else {
fieldName = String.format(DorisConstants.DATE_FORMAT, originField, format);
}
} else { } else {
fieldName = originField; fieldName = originField;
} }
@ -1185,11 +1195,24 @@ public class DorisQueryProvider extends QueryProvider {
if (x.getDeType() == 1) { if (x.getDeType() == 1) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
if (x.getDeExtractType() == 0) { if (x.getDeExtractType() == 0) {
fieldName = String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, StringUtils.isNotEmpty(x.getDateFormat()) ? x.getDateFormat() : DorisConstants.DEFAULT_DATE_FORMAT), format); if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, DorisConstants.DEFAULT_DATE_FORMAT), "%Y"),
String.format(DorisConstants.QUARTER, String.format(DorisConstants.STR_TO_DATE, originField, DorisConstants.DEFAULT_DATE_FORMAT)));
} else {
fieldName = String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, StringUtils.isNotEmpty(x.getDateFormat()) ? x.getDateFormat() : DorisConstants.DEFAULT_DATE_FORMAT), format);
}
} else { } else {
String cast = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
String from_unixtime = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT); String from_unixtime = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
fieldName = String.format(DorisConstants.DATE_FORMAT, from_unixtime, format); if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(DorisConstants.DATE_FORMAT, from_unixtime, "%Y"),
String.format(DorisConstants.QUARTER, from_unixtime));
} else {
fieldName = String.format(DorisConstants.DATE_FORMAT, from_unixtime, format);
}
} }
} else if (x.getDeType() == 0) { } else if (x.getDeType() == 0) {
fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.VARCHAR); fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.VARCHAR);

5
frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
View File

@ -298,7 +298,10 @@ export default {
}, },
getDateExtStatus() { getDateExtStatus() {
if (this.chart) { if (this.chart) {
this.showDateExt = this.chart.datasourceType === 'mysql' && this.chart.datasetMode === 0 this.showDateExt = this.showDateExt = this.chart.datasourceType === 'mysql' ||
this.chart.datasourceType === 'ds_doris' ||
this.chart.datasourceType === 'StarRocks' ||
this.chart.datasetMode === 1
} else { } else {
this.showDateExt = false this.showDateExt = false
} }

5
frontend/src/views/chart/components/dragItem/DimensionItem.vue
View File

@ -342,7 +342,10 @@ export default {
getDateExtStatus() { getDateExtStatus() {
if (this.chart) { if (this.chart) {
this.showDateExt = this.chart.datasourceType === 'mysql' && this.chart.datasetMode === 0 this.showDateExt = this.chart.datasourceType === 'mysql' ||
this.chart.datasourceType === 'ds_doris' ||
this.chart.datasourceType === 'StarRocks' ||
this.chart.datasetMode === 1
} else { } else {
this.showDateExt = false this.showDateExt = false
} }