Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
4975340c
提交
4975340c
authored
3月 17, 2022
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 解决视图插件冲突
上级
c21154da
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
10 行增加
和
114 行删除
+10
-114
DatasourceTypes.java
...n/java/io/dataease/commons/constants/DatasourceTypes.java
+0
-68
ProviderFactory.java
...d/src/main/java/io/dataease/provider/ProviderFactory.java
+1
-1
JdbcProvider.java
...in/java/io/dataease/provider/datasource/JdbcProvider.java
+1
-1
MysqlConstants.java
...ava/io/dataease/provider/engine/mysql/MysqlConstants.java
+2
-1
ImpalaConstants.java
...va/io/dataease/provider/query/impala/ImpalaConstants.java
+0
-39
ImpalaQueryProvider.java
...o/dataease/provider/query/impala/ImpalaQueryProvider.java
+3
-2
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+1
-0
ExtractDataService.java
.../java/io/dataease/service/dataset/ExtractDataService.java
+1
-1
DatasourceService.java
...ava/io/dataease/service/datasource/DatasourceService.java
+1
-1
没有找到文件。
backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java
deleted
100644 → 0
浏览文件 @
c21154da
package
io
.
dataease
.
commons
.
constants
;
public
enum
DatasourceTypes
{
excel
(
"excel"
,
"excel"
,
""
,
""
,
""
,
""
,
""
),
mysql
(
"mysql"
,
"mysql"
,
"com.mysql.jdbc.Driver"
,
"`"
,
"`"
,
"'"
,
"'"
),
hive
(
"hive"
,
"hive"
,
"org.apache.hive.jdbc.HiveDriver"
,
"`"
,
"`"
,
"'"
,
"'"
),
impala
(
"impala"
,
"impala"
,
"org.apache.hive.jdbc.HiveDriver"
,
"`"
,
"`"
,
"'"
,
"'"
),
mariadb
(
"mariadb"
,
"mariadb"
,
"com.mysql.jdbc.Driver"
,
"`"
,
"`"
,
"'"
,
"'"
),
ds_doris
(
"ds_doris"
,
"ds_doris"
,
"com.mysql.jdbc.Driver"
,
"`"
,
"`"
,
"'"
,
"'"
),
pg
(
"pg"
,
"pg"
,
"org.postgresql.Driver"
,
"\""
,
"\""
,
"\""
,
"\""
),
sqlServer
(
"sqlServer"
,
"sqlServer"
,
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
,
"\""
,
"\""
,
"\""
,
"\""
),
oracle
(
"oracle"
,
"oracle"
,
"oracle.jdbc.driver.OracleDriver"
,
"\""
,
"\""
,
"\""
,
"\""
),
mongo
(
"mongo"
,
"mongodb"
,
"com.mongodb.jdbc.MongoDriver"
,
"`"
,
"`"
,
"\""
,
"\""
),
ck
(
"ch"
,
"ch"
,
"ru.yandex.clickhouse.ClickHouseDriver"
,
"`"
,
"`"
,
"'"
,
"'"
),
db2
(
"db2"
,
"db2"
,
"com.ibm.db2.jcc.DB2Driver"
,
"\""
,
"\""
,
"\""
,
"\""
),
es
(
"es"
,
"es"
,
""
,
"\""
,
"\""
,
"\""
,
"\""
),
redshift
(
"redshift"
,
"redshift"
,
"org.postgresql.Driver"
,
"\""
,
"\""
,
"\""
,
"\""
),
api
(
"api"
,
"api"
,
""
,
"\""
,
"\""
,
"\""
,
"\""
),
engine_doris
(
"engine_doris"
,
"engine_doris"
,
"com.mysql.jdbc.Driver"
,
"`"
,
"`"
,
""
,
""
),
engine_mysql
(
"mysql"
,
"mysql"
,
"com.mysql.jdbc.Driver"
,
"`"
,
"`"
,
"'"
,
"'"
);
private
String
feature
;
private
String
desc
;
private
String
driver
;
private
String
keywordPrefix
;
private
String
keywordSuffix
;
private
String
aliasPrefix
;
private
String
aliasSuffix
;
DatasourceTypes
(
String
feature
,
String
desc
,
String
driver
,
String
keywordPrefix
,
String
keywordSuffix
,
String
aliasPrefix
,
String
aliasSuffix
)
{
this
.
feature
=
feature
;
this
.
desc
=
desc
;
this
.
driver
=
driver
;
this
.
keywordPrefix
=
keywordPrefix
;
this
.
keywordSuffix
=
keywordSuffix
;
this
.
aliasPrefix
=
aliasPrefix
;
this
.
aliasSuffix
=
aliasSuffix
;
}
public
String
getFeature
()
{
return
feature
;
}
public
String
getDesc
()
{
return
desc
;
}
public
String
getDriver
()
{
return
driver
;
}
public
String
getKeywordPrefix
()
{
return
keywordPrefix
;
}
public
String
getKeywordSuffix
()
{
return
keywordSuffix
;
}
public
String
getAliasPrefix
()
{
return
aliasPrefix
;
}
public
String
getAliasSuffix
()
{
return
aliasSuffix
;
}
}
backend/src/main/java/io/dataease/provider/ProviderFactory.java
浏览文件 @
4975340c
package
io
.
dataease
.
provider
;
import
io.dataease.
commons
.constants.DatasourceTypes
;
import
io.dataease.
plugins.common
.constants.DatasourceTypes
;
import
io.dataease.provider.datasource.DatasourceProvider
;
import
io.dataease.provider.query.api.ApiProvider
;
import
org.springframework.beans.BeansException
;
...
...
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
浏览文件 @
4975340c
...
...
@@ -5,11 +5,11 @@ import com.alibaba.druid.pool.DruidDataSource;
import
com.alibaba.druid.pool.DruidPooledConnection
;
import
com.alibaba.druid.wall.WallFilter
;
import
com.google.gson.Gson
;
import
io.dataease.commons.constants.DatasourceTypes
;
import
io.dataease.controller.request.datasource.DatasourceRequest
;
import
io.dataease.dto.datasource.*
;
import
io.dataease.exception.DataEaseException
;
import
io.dataease.i18n.Translator
;
import
io.dataease.plugins.common.constants.DatasourceTypes
;
import
io.dataease.provider.ProviderFactory
;
import
io.dataease.provider.QueryProvider
;
import
org.apache.commons.lang3.StringUtils
;
...
...
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlConstants.java
浏览文件 @
4975340c
...
...
@@ -3,7 +3,8 @@ package io.dataease.provider.engine.mysql;
import
io.dataease.plugins.common.constants.SQLConstants
;
import
static
io
.
dataease
.
commons
.
constants
.
DatasourceTypes
.
engine_mysql
;
import
static
io
.
dataease
.
plugins
.
common
.
constants
.
DatasourceTypes
.
engine_mysql
;
import
static
io
.
dataease
.
plugins
.
common
.
constants
.
DatasourceTypes
.
engine_mysql
;
/**
* @Author gin
...
...
backend/src/main/java/io/dataease/provider/query/impala/ImpalaConstants.java
deleted
100644 → 0
浏览文件 @
c21154da
package
io
.
dataease
.
provider
.
query
.
impala
;
import
io.dataease.provider.SQLConstants
;
import
static
io
.
dataease
.
commons
.
constants
.
DatasourceTypes
.
mysql
;
public
class
ImpalaConstants
extends
SQLConstants
{
public
static
final
String
KEYWORD_TABLE
=
mysql
.
getKeywordPrefix
()
+
"%s"
+
mysql
.
getKeywordSuffix
();
public
static
final
String
KEYWORD_FIX
=
"%s."
+
mysql
.
getKeywordPrefix
()
+
"%s"
+
mysql
.
getKeywordSuffix
();
public
static
final
String
UNIX_TIMESTAMP
=
"unix_timestamp(%s)"
;
public
static
final
String
DATE_FORMAT
=
"from_unixtime(UNIX_TIMESTAMP(%s), '%s')"
;
public
static
final
String
FROM_UNIXTIME
=
"FROM_UNIXTIME(%s,'%s')"
;
public
static
final
String
STR_TO_DATE
=
"STR_TO_DATE(%s,'%s')"
;
public
static
final
String
CAST
=
"CAST(%s AS %s)"
;
public
static
final
String
DEFAULT_DATE_FORMAT
=
"yyyy-MM-dd HH:mm:ss"
;
public
static
final
String
DEFAULT_INT_FORMAT
=
"BIGINT"
;
public
static
final
String
DEFAULT_FLOAT_FORMAT
=
"DECIMAL(20,2)"
;
public
static
final
String
WHERE_VALUE_NULL
=
"(NULL,'')"
;
public
static
final
String
WHERE_VALUE_VALUE
=
"'%s'"
;
public
static
final
String
AGG_COUNT
=
"COUNT(*)"
;
public
static
final
String
AGG_FIELD
=
"%s(%s)"
;
public
static
final
String
WHERE_BETWEEN
=
"'%s' AND '%s'"
;
public
static
final
String
BRACKETS
=
"(%s)"
;
}
backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
浏览文件 @
4975340c
...
...
@@ -11,8 +11,9 @@ import io.dataease.dto.chart.ChartCustomFilterItemDTO;
import
io.dataease.dto.chart.ChartFieldCustomFilterDTO
;
import
io.dataease.dto.chart.ChartViewFieldDTO
;
import
io.dataease.dto.sqlObj.SQLObj
;
import
io.dataease.plugins.common.constants.ImpalaConstants
;
import
io.dataease.plugins.common.constants.SQLConstants
;
import
io.dataease.provider.QueryProvider
;
import
io.dataease.provider.SQLConstants
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -29,7 +30,7 @@ import java.util.regex.Matcher;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
import
static
io
.
dataease
.
p
rovider
.
SQLConstants
.
TABLE_ALIAS_PREFIX
;
import
static
io
.
dataease
.
p
lugins
.
common
.
constants
.
SQLConstants
.
TABLE_ALIAS_PREFIX
;
@Service
(
"impalaQuery"
)
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
4975340c
...
...
@@ -24,6 +24,7 @@ import io.dataease.dto.dataset.union.UnionParamDTO;
import
io.dataease.dto.datasource.TableField
;
import
io.dataease.exception.DataEaseException
;
import
io.dataease.i18n.Translator
;
import
io.dataease.plugins.common.constants.DatasourceTypes
;
import
io.dataease.plugins.loader.ClassloaderResponsity
;
import
io.dataease.provider.ProviderFactory
;
import
io.dataease.provider.datasource.DatasourceProvider
;
...
...
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @
4975340c
...
...
@@ -10,8 +10,8 @@ import io.dataease.base.mapper.ext.ExtChartViewMapper;
import
io.dataease.commons.constants.*
;
import
io.dataease.commons.model.AuthURD
;
import
io.dataease.commons.utils.*
;
import
io.dataease.commons.constants.DatasourceTypes
;
import
io.dataease.controller.request.datasource.ApiDefinition
;
import
io.dataease.plugins.common.constants.DatasourceTypes
;
import
io.dataease.provider.DDLProvider
;
import
io.dataease.provider.datasource.DatasourceProvider
;
import
io.dataease.provider.datasource.JdbcProvider
;
...
...
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
浏览文件 @
4975340c
...
...
@@ -10,7 +10,6 @@ import io.dataease.base.mapper.DatasetTableMapper;
import
io.dataease.base.mapper.DatasourceMapper
;
import
io.dataease.base.mapper.ext.ExtDataSourceMapper
;
import
io.dataease.base.mapper.ext.query.GridExample
;
import
io.dataease.commons.constants.DatasourceTypes
;
import
io.dataease.commons.constants.DePermissionType
;
import
io.dataease.commons.exception.DEException
;
import
io.dataease.commons.model.AuthURD
;
...
...
@@ -28,6 +27,7 @@ import io.dataease.dto.dataset.DataTableInfoDTO;
import
io.dataease.dto.datasource.*
;
import
io.dataease.exception.DataEaseException
;
import
io.dataease.i18n.Translator
;
import
io.dataease.plugins.common.constants.DatasourceTypes
;
import
io.dataease.provider.ProviderFactory
;
import
io.dataease.provider.datasource.ApiProvider
;
import
io.dataease.provider.datasource.DatasourceProvider
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论