From d89ebba74887a07b50683c0773fac2cbfa474b0b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 22 Nov 2022 10:52:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/provider/query/ck/CKQueryProvider.java | 13 +++++++++++++ .../provider/query/db2/Db2QueryProvider.java | 13 +++++++++++++ .../dataease/provider/query/es/EsQueryProvider.java | 13 +++++++++++++ .../provider/query/hive/HiveQueryProvider.java | 13 +++++++++++++ .../provider/query/impala/ImpalaQueryProvider.java | 13 +++++++++++++ .../provider/query/mongodb/MongoQueryProvider.java | 13 +++++++++++++ .../provider/query/oracle/OracleQueryProvider.java | 13 +++++++++++++ .../dataease/provider/query/pg/PgQueryProvider.java | 13 +++++++++++++ .../query/redshift/RedshiftQueryProvider.java | 13 +++++++++++++ 9 files changed, 117 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index 8f2c593918..2b8e0b1008 100644 --- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.ck; +import com.alibaba.fastjson.JSONArray; import io.dataease.commons.utils.BeanUtils; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -17,6 +18,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1400,4 +1402,15 @@ public class CKQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"%Y%m%d\"},\n" + + "{\"dateformat\": \"%Y/%m/%d\"},\n" + + "{\"dateformat\": \"%Y-%m-%d\"},\n" + + "{\"dateformat\": \"%Y%m%d %H:%M:%S\"},\n" + + "{\"dateformat\": \"%Y/%m/%d %H:%M:%S\"},\n" + + "{\"dateformat\": \"%Y-%m-%d %H:%M:%S\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 7fad9ee875..e1cdf780f5 100644 --- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.db2; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.dto.datasource.Db2Configuration; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1378,4 +1380,15 @@ public class Db2QueryProvider extends QueryProvider { schema = String.format(Db2Constants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(Db2Constants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 673392fabc..2a7c7134fe 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.es; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; import org.apache.commons.collections4.CollectionUtils; @@ -1311,4 +1313,15 @@ public class EsQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyy/MMdd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index ce089d53c9..14fa0d1b06 100644 --- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.hive; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1299,4 +1301,15 @@ public class HiveQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyyMMdd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java index edfd4a8810..2e33fc8d93 100644 --- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.impala; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1276,4 +1278,15 @@ public class ImpalaQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd\"},\n" + + "{\"dateformat\": \"yyyyMMdd\"},\n" + + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index 1a11a1d232..34730987a4 100644 --- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.mongodb; +import com.alibaba.fastjson.JSONArray; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableFieldExample; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.datasource.query.Utils; @@ -1150,4 +1152,15 @@ public class MongoQueryProvider extends QueryProvider { return sql; } } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"%Y-%m-%d\"},\n" + + "{\"dateformat\": \"%Y/%m/%d\"},\n" + + "{\"dateformat\": \"%Y%m%d\"},\n" + + "{\"dateformat\": \"%Y-%m-%d %H:%i:%S\"},\n" + + "{\"dateformat\": \"%Y/%m/%d %H:%i:%S\"},\n" + + "{\"dateformat\": \"%Y%m%d %H:%i:%S\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 8d1c685527..c3ce406b2d 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.oracle; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.dto.datasource.OracleConfiguration; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1427,4 +1429,15 @@ public class OracleQueryProvider extends QueryProvider { schema = String.format(OracleConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(OracleConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index ead69fa59f..227fb75f1d 100644 --- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.pg; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1301,4 +1303,15 @@ public class PgQueryProvider extends QueryProvider { schema = String.format(PgConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } } diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 2ba6bc0e15..4a8fa038aa 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -1,5 +1,6 @@ package io.dataease.provider.query.redshift; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem; +import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.query.QueryProvider; @@ -1286,4 +1288,15 @@ public class RedshiftQueryProvider extends QueryProvider { schema = String.format(PgConstants.KEYWORD_TABLE, schema); return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table); } + + public List dateformat() { + return JSONArray.parseArray("[\n" + + "{\"dateformat\": \"YYYY-MM-DD\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD\"},\n" + + "{\"dateformat\": \"YYYYMMDD\"},\n" + + "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" + + "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" + + "]", Dateformat.class); + } }