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

Merge pull request #8559 from dataease/pr@dev@feat_date

Browse Source 
feat(视图): ClickHouse, Oracle支持年季度、年周
This commit is contained in:
Junjun 2024-03-18 14:15:22 +08:00 committed by GitHub
commit 6d974ae409
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -1427,7 +1427,17 @@ public class CKQueryProvider extends QueryProvider {
if (field.getDeType() == DeTypeConstants.DE_TIME) {
String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
whereName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, originName), format);
if (StringUtils.equalsIgnoreCase(request.getDateStyle(), "y_Q")) {
whereName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originName + ")"),
String.format(CKConstants.toQuarter, "toDate(" + originName + ")"));
} else if (StringUtils.equalsIgnoreCase(request.getDateStyle(), "y_W")) {
whereName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originName + ")"),
String.format(CKConstants.toWeek, "toDate(" + originName + ")"));
} else {
whereName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, originName), format);
}
}
if (field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == 4) {
String cast = String.format(CKConstants.toFloat64, originName);
@ -1540,8 +1550,12 @@ public class CKQueryProvider extends QueryProvider {
switch (dateStyle) {
case "y":
return "%Y";
case "y_Q":
return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M":
return "%Y" + split + "%m";
case "y_W":
return "CONCAT(%s,'" + split + "','W',%s)";
case "y_M_d":
return "%Y" + split + "%m" + split + "%d";
case "H_m_s":
@ -1568,7 +1582,17 @@ public class CKQueryProvider extends QueryProvider {
}
} else if (x.getDeType() == DeTypeConstants.DE_TIME) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
fieldName = String.format(CKConstants.formatDateTime, originField, format);
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toQuarter, "toDate(" + originField + ")"));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toWeek, "toDate(" + originField + ")"));
} else {
fieldName = String.format(CKConstants.formatDateTime, originField, format);
}
} else {
fieldName = originField;
}
@ -1576,9 +1600,29 @@ public class CKQueryProvider extends QueryProvider {
if (x.getDeType() == DeTypeConstants.DE_TIME) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, originField), format);
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toQuarter, "toDate(" + originField + ")"));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toWeek, "toDate(" + originField + ")"));
} else {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, originField), format);
}
} else {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, String.format(CKConstants.toFloat64, originField)), format);
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toQuarter, "toDate(" + originField + ")"));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"),
String.format(CKConstants.toWeek, "toDate(" + originField + ")"));
} else {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, String.format(CKConstants.toFloat64, originField)), format);
}
}
} else {
if (x.getDeType() == DeTypeConstants.DE_INT) {

4
core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -1604,8 +1604,12 @@ public class OracleQueryProvider extends QueryProvider {
switch (dateStyle) {
case "y":
return "YYYY";
case "y_Q":
return "YYYY" + split + "\"Q\"Q";
case "y_M":
return "YYYY" + split + "MM";
case "y_W":
return "YYYY" + split + "\"W\"IW";
case "y_M_d":
return "YYYY" + split + "MM" + split + "DD";
case "H_m_s":

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

@ -335,6 +335,8 @@ export default {
this.showDateExt = (this.chart.datasourceType === 'mysql' ||
this.chart.datasourceType === 'ds_doris' ||
this.chart.datasourceType === 'StarRocks' ||
this.chart.datasourceType === 'ck' ||
this.chart.datasourceType === 'oracle' ||
this.chart.datasetMode === 1) && this.chart.type !== 'bar-time-range'
} else {
this.showDateExt = false

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

@ -356,6 +356,8 @@ export default {
this.showDateExt = this.chart.datasourceType === 'mysql' ||
this.chart.datasourceType === 'ds_doris' ||
this.chart.datasourceType === 'StarRocks' ||
this.chart.datasourceType === 'ck' ||
this.chart.datasourceType === 'oracle' ||
this.chart.datasetMode === 1
} else {
this.showDateExt = false

5
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/constants/datasource/CKConstants.java
View File

@ -40,5 +40,10 @@ public class CKConstants extends SQLConstants {
public static final String GROUP_CONCAT = "arrayStringConcat(groupArray(%s), ',')";
public static final String toYear = "toYear(%s)";
public static final String toWeek = "toWeek(%s, 5)";
public static final String toQuarter = "toQuarter(%s)";
}