Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
73c95317
提交
73c95317
authored
11月 04, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: pg 时间类型转换
上级
3527f3b2
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
5 行增加
和
7 行删除
+5
-7
PgConstants.java
.../main/java/io/dataease/provider/query/pg/PgConstants.java
+0
-2
PgQueryProvider.java
...n/java/io/dataease/provider/query/pg/PgQueryProvider.java
+3
-3
RedshiftQueryProvider.java
...taease/provider/query/redshift/RedshiftQueryProvider.java
+2
-2
没有找到文件。
backend/src/main/java/io/dataease/provider/query/pg/PgConstants.java
浏览文件 @
73c95317
...
@@ -19,8 +19,6 @@ public class PgConstants extends SQLConstants {
...
@@ -19,8 +19,6 @@ public class PgConstants extends SQLConstants {
public
static
final
String
FROM_UNIXTIME
=
"to_timestamp(%s)"
;
public
static
final
String
FROM_UNIXTIME
=
"to_timestamp(%s)"
;
public
static
final
String
TO_DATE
=
"to_date(%s,'%s')"
;
public
static
final
String
CAST
=
"CAST(%s AS %s)"
;
public
static
final
String
CAST
=
"CAST(%s AS %s)"
;
public
static
final
String
DEFAULT_DATE_FORMAT
=
"YYYY-MM-DD HH24:MI:SS"
;
public
static
final
String
DEFAULT_DATE_FORMAT
=
"YYYY-MM-DD HH24:MI:SS"
;
...
...
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
浏览文件 @
73c95317
...
@@ -789,7 +789,7 @@ public class PgQueryProvider extends QueryProvider {
...
@@ -789,7 +789,7 @@ public class PgQueryProvider extends QueryProvider {
}
}
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
whereName
=
String
.
format
(
PgConstants
.
TO_DATE
,
originName
,
PgConstants
.
DEFAULT_DATE_FORMAT
);
whereName
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"timestamp"
);
}
}
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
...
@@ -853,7 +853,7 @@ public class PgQueryProvider extends QueryProvider {
...
@@ -853,7 +853,7 @@ public class PgQueryProvider extends QueryProvider {
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
whereName
=
String
.
format
(
PgConstants
.
TO_DATE
,
originName
,
PgConstants
.
DEFAULT_DATE_FORMAT
);
whereName
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"timestamp"
);
}
}
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
...
@@ -944,7 +944,7 @@ public class PgQueryProvider extends QueryProvider {
...
@@ -944,7 +944,7 @@ public class PgQueryProvider extends QueryProvider {
if
(
x
.
getDeType
()
==
DeTypeConstants
.
DE_TIME
)
{
if
(
x
.
getDeType
()
==
DeTypeConstants
.
DE_TIME
)
{
String
format
=
transDateFormat
(
x
.
getDateStyle
(),
x
.
getDatePattern
());
String
format
=
transDateFormat
(
x
.
getDateStyle
(),
x
.
getDatePattern
());
if
(
x
.
getDeExtractType
()
==
DeTypeConstants
.
DE_STRING
)
{
if
(
x
.
getDeExtractType
()
==
DeTypeConstants
.
DE_STRING
)
{
fieldName
=
String
.
format
(
PgConstants
.
DATE_FORMAT
,
String
.
format
(
PgConstants
.
TO_DATE
,
originField
,
"YYYY-MM-DD HH24:MI:SS
"
),
format
);
fieldName
=
String
.
format
(
PgConstants
.
DATE_FORMAT
,
String
.
format
(
PgConstants
.
CAST
,
originField
,
"timestamp
"
),
format
);
}
else
{
}
else
{
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originField
,
"bigint"
);
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originField
,
"bigint"
);
String
from_unixtime
=
String
.
format
(
PgConstants
.
FROM_UNIXTIME
,
cast
);
String
from_unixtime
=
String
.
format
(
PgConstants
.
FROM_UNIXTIME
,
cast
);
...
...
backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
浏览文件 @
73c95317
...
@@ -726,7 +726,7 @@ public class RedshiftQueryProvider extends QueryProvider {
...
@@ -726,7 +726,7 @@ public class RedshiftQueryProvider extends QueryProvider {
}
}
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
whereName
=
String
.
format
(
PgConstants
.
TO_DATE
,
originName
,
PgConstants
.
DEFAULT_DATE_FORMAT
);
whereName
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"timestamp"
);
}
}
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
...
@@ -784,7 +784,7 @@ public class RedshiftQueryProvider extends QueryProvider {
...
@@ -784,7 +784,7 @@ public class RedshiftQueryProvider extends QueryProvider {
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeType
()
==
1
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
if
(
field
.
getDeExtractType
()
==
0
||
field
.
getDeExtractType
()
==
5
)
{
whereName
=
String
.
format
(
PgConstants
.
TO_DATE
,
originName
,
PgConstants
.
DEFAULT_DATE_FORMAT
);
whereName
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"timestamp"
);
}
}
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
if
(
field
.
getDeExtractType
()
==
2
||
field
.
getDeExtractType
()
==
3
||
field
.
getDeExtractType
()
==
4
)
{
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
String
cast
=
String
.
format
(
PgConstants
.
CAST
,
originName
,
"bigint"
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论