Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
9c3ca099
提交
9c3ca099
authored
4月 29, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 抽取数据到doris
上级
86f5a0fe
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
59 行增加
和
43 行删除
+59
-43
pom.xml
backend/pom.xml
+27
-27
DorisTableUtils.java
.../main/java/io/dataease/commons/utils/DorisTableUtils.java
+6
-2
CommonConfig.java
backend/src/main/java/io/dataease/config/CommonConfig.java
+1
-0
DorisConfigration.java
...in/java/io/dataease/datasource/dto/DorisConfigration.java
+11
-0
MysqlConfigration.java
...in/java/io/dataease/datasource/dto/MysqlConfigration.java
+1
-1
JdbcProvider.java
...in/java/io/dataease/datasource/provider/JdbcProvider.java
+13
-13
ExtractDataService.java
.../java/io/dataease/service/dataset/ExtractDataService.java
+0
-0
没有找到文件。
backend/pom.xml
浏览文件 @
9c3ca099
...
@@ -457,33 +457,33 @@
...
@@ -457,33 +457,33 @@
</dependencies>
</dependencies>
</plugin>
</plugin>
<plugin
>
<!-- <plugin>--
>
<groupId>
org.apache.maven.plugins
</groupId
>
<!-- <groupId>org.apache.maven.plugins</groupId>--
>
<artifactId>
maven-antrun-plugin
</artifactId
>
<!-- <artifactId>maven-antrun-plugin</artifactId>--
>
<executions
>
<!-- <executions>--
>
<execution
>
<!-- <execution>--
>
<id>
main-class-placement
</id
>
<!-- <id>main-class-placement</id>--
>
<phase>
generate-resources
</phase
>
<!-- <phase>generate-resources</phase>--
>
<configuration
>
<!-- <configuration>--
>
<target
>
<!-- <target>--
>
<move
todir=
"src/main/resources/static"
>
<!-- <move todir="src/main/resources/static">--
>
<fileset
dir=
"../frontend/dist"
>
<!-- <fileset dir="../frontend/dist">--
>
<exclude
name=
"*.html"
/
>
<!-- <exclude name="*.html"/>--
>
</fileset
>
<!-- </fileset>--
>
</move
>
<!-- </move>--
>
<move
todir=
"src/main/resources/templates"
>
<!-- <move todir="src/main/resources/templates">--
>
<fileset
dir=
"../frontend/dist"
>
<!-- <fileset dir="../frontend/dist">--
>
<include
name=
"*.html"
/
>
<!-- <include name="*.html"/>--
>
</fileset
>
<!-- </fileset>--
>
</move
>
<!-- </move>--
>
</target
>
<!-- </target>--
>
</configuration
>
<!-- </configuration>--
>
<goals
>
<!-- <goals>--
>
<goal>
run
</goal
>
<!-- <goal>run</goal>--
>
</goals
>
<!-- </goals>--
>
</execution
>
<!-- </execution>--
>
</executions
>
<!-- </executions>--
>
</plugin
>
<!-- </plugin>--
>
</plugins>
</plugins>
</build>
</build>
...
...
backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java
浏览文件 @
9c3ca099
...
@@ -6,8 +6,12 @@ public class DorisTableUtils {
...
@@ -6,8 +6,12 @@ public class DorisTableUtils {
return
"ds_"
+
datasetId
.
replace
(
"-"
,
"_"
);
return
"ds_"
+
datasetId
.
replace
(
"-"
,
"_"
);
}
}
public
static
String
doristmpName
(
String
dorisName
){
public
static
String
dorisTmpName
(
String
dorisName
){
return
"tmp"
+
dorisName
;
return
"tmp_"
+
dorisName
;
}
public
static
String
dorisDeleteName
(
String
dorisName
){
return
"delete_"
+
dorisName
;
}
}
}
}
backend/src/main/java/io/dataease/config/CommonConfig.java
浏览文件 @
9c3ca099
...
@@ -33,6 +33,7 @@ public class CommonConfig {
...
@@ -33,6 +33,7 @@ public class CommonConfig {
jsonObject
.
put
(
"password"
,
env
.
getProperty
(
"doris.password"
,
"dataease"
));
jsonObject
.
put
(
"password"
,
env
.
getProperty
(
"doris.password"
,
"dataease"
));
jsonObject
.
put
(
"host"
,
env
.
getProperty
(
"doris.host"
,
"doris"
));
jsonObject
.
put
(
"host"
,
env
.
getProperty
(
"doris.host"
,
"doris"
));
jsonObject
.
put
(
"port"
,
env
.
getProperty
(
"doris.port"
,
"9030"
));
jsonObject
.
put
(
"port"
,
env
.
getProperty
(
"doris.port"
,
"9030"
));
jsonObject
.
put
(
"httpPort"
,
env
.
getProperty
(
"doris.httpPort"
,
"8030"
));
Datasource
datasource
=
new
Datasource
();
Datasource
datasource
=
new
Datasource
();
datasource
.
setId
(
"doris"
);
datasource
.
setId
(
"doris"
);
...
...
backend/src/main/java/io/dataease/datasource/dto/DorisConfigration.java
0 → 100644
浏览文件 @
9c3ca099
package
io
.
dataease
.
datasource
.
dto
;
import
lombok.Getter
;
import
lombok.Setter
;
@Getter
@Setter
public
class
DorisConfigration
extends
MysqlConfigration
{
private
Integer
httpPort
;
}
backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration
DTO
.java
→
backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
浏览文件 @
9c3ca099
...
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
@Getter
@Getter
@Setter
@Setter
public
class
MysqlConfigration
DTO
extends
JdbcDTO
{
public
class
MysqlConfigration
extends
JdbcDTO
{
private
String
driver
=
"com.mysql.cj.jdbc.Driver"
;
private
String
driver
=
"com.mysql.cj.jdbc.Driver"
;
...
...
backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
浏览文件 @
9c3ca099
...
@@ -3,7 +3,7 @@ package io.dataease.datasource.provider;
...
@@ -3,7 +3,7 @@ package io.dataease.datasource.provider;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.mchange.v2.c3p0.ComboPooledDataSource
;
import
com.mchange.v2.c3p0.ComboPooledDataSource
;
import
io.dataease.datasource.constants.DatasourceTypes
;
import
io.dataease.datasource.constants.DatasourceTypes
;
import
io.dataease.datasource.dto.MysqlConfigration
DTO
;
import
io.dataease.datasource.dto.MysqlConfigration
;
import
io.dataease.datasource.dto.SqlServerConfigration
;
import
io.dataease.datasource.dto.SqlServerConfigration
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.datasource.request.DatasourceRequest
;
import
io.dataease.datasource.request.DatasourceRequest
;
...
@@ -292,11 +292,11 @@ public class JdbcProvider extends DatasourceProvider {
...
@@ -292,11 +292,11 @@ public class JdbcProvider extends DatasourceProvider {
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
switch
(
datasourceType
)
{
switch
(
datasourceType
)
{
case
mysql:
case
mysql:
MysqlConfigration
DTO
mysqlConfigrationDTO
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigrationDTO
.
class
);
MysqlConfigration
mysqlConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigration
.
class
);
username
=
mysqlConfigration
DTO
.
getUsername
();
username
=
mysqlConfigration
.
getUsername
();
password
=
mysqlConfigration
DTO
.
getPassword
();
password
=
mysqlConfigration
.
getPassword
();
driver
=
mysqlConfigration
DTO
.
getDriver
();
driver
=
mysqlConfigration
.
getDriver
();
jdbcurl
=
mysqlConfigration
DTO
.
getJdbc
();
jdbcurl
=
mysqlConfigration
.
getJdbc
();
break
;
break
;
case
sqlServer:
case
sqlServer:
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
...
@@ -323,11 +323,11 @@ public class JdbcProvider extends DatasourceProvider {
...
@@ -323,11 +323,11 @@ public class JdbcProvider extends DatasourceProvider {
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
switch
(
datasourceType
)
{
switch
(
datasourceType
)
{
case
mysql:
case
mysql:
MysqlConfigration
DTO
mysqlConfigrationDTO
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigrationDTO
.
class
);
MysqlConfigration
mysqlConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigration
.
class
);
dataSource
.
setUser
(
mysqlConfigration
DTO
.
getUsername
());
dataSource
.
setUser
(
mysqlConfigration
.
getUsername
());
dataSource
.
setDriverClass
(
mysqlConfigration
DTO
.
getDriver
());
dataSource
.
setDriverClass
(
mysqlConfigration
.
getDriver
());
dataSource
.
setPassword
(
mysqlConfigration
DTO
.
getPassword
());
dataSource
.
setPassword
(
mysqlConfigration
.
getPassword
());
dataSource
.
setJdbcUrl
(
mysqlConfigration
DTO
.
getJdbc
());
dataSource
.
setJdbcUrl
(
mysqlConfigration
.
getJdbc
());
break
;
break
;
case
sqlServer:
case
sqlServer:
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
...
@@ -345,8 +345,8 @@ public class JdbcProvider extends DatasourceProvider {
...
@@ -345,8 +345,8 @@ public class JdbcProvider extends DatasourceProvider {
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
switch
(
datasourceType
)
{
switch
(
datasourceType
)
{
case
mysql:
case
mysql:
MysqlConfigration
DTO
mysqlConfigrationDTO
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigrationDTO
.
class
);
MysqlConfigration
mysqlConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
MysqlConfigration
.
class
);
return
mysqlConfigration
DTO
.
getDataBase
();
return
mysqlConfigration
.
getDataBase
();
case
sqlServer:
case
sqlServer:
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
SqlServerConfigration
sqlServerConfigration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
SqlServerConfigration
.
class
);
return
sqlServerConfigration
.
getDataBase
();
return
sqlServerConfigration
.
getDataBase
();
...
...
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @
9c3ca099
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论