Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
463e45b6
提交
463e45b6
authored
7月 28, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 自定义数据集关联问题
上级
b7cccef6
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
55 行增加
和
48 行删除
+55
-48
DorisQueryProvider.java
...n/java/io/dataease/provider/doris/DorisQueryProvider.java
+12
-12
MysqlQueryProvider.java
...n/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+12
-12
OracleQueryProvider.java
...java/io/dataease/provider/oracle/OracleQueryProvider.java
+10
-10
SqlserverQueryProvider.java
...o/dataease/provider/sqlserver/SqlserverQueryProvider.java
+0
-0
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+21
-14
没有找到文件。
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
浏览文件 @
463e45b6
...
...
@@ -81,7 +81,7 @@ public class DorisQueryProvider extends QueryProvider {
}
@Override
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
)
{
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
SQLObj
tableObj
=
SQLObj
.
builder
()
.
tableName
((
table
.
startsWith
(
"("
)
&&
table
.
endsWith
(
")"
))
?
table
:
String
.
format
(
DorisConstants
.
KEYWORD_TABLE
,
table
))
.
tableAlias
(
String
.
format
(
TABLE_ALIAS_PREFIX
,
0
))
...
...
@@ -130,7 +130,7 @@ public class DorisQueryProvider extends QueryProvider {
STGroup
stg
=
new
STGroupFile
(
SQLConstants
.
SQL_TEMPLATE
);
ST
st_sql
=
stg
.
getInstanceOf
(
"querySql"
);
if
(
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
isGroup
&&
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
ObjectUtils
.
isNotEmpty
(
tableObj
))
st_sql
.
add
(
"table"
,
tableObj
);
if
((
fields
.
size
()
>
0
))
{
xOrders
.
add
(
SQLObj
.
builder
()
...
...
@@ -144,28 +144,28 @@ public class DorisQueryProvider extends QueryProvider {
}
@Override
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
)
{
return
createQuerySQL
(
"("
+
sql
+
")"
,
fields
);
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
return
createQuerySQL
(
"("
+
sql
+
")"
,
fields
,
isGroup
);
}
@Override
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
return
createQuerySQL
(
table
,
fields
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
return
createQuerySQL
(
table
,
fields
,
isGroup
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
}
@Override
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
return
createQuerySQL
(
table
,
fields
)
+
" LIMIT 0,"
+
limit
;
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
createQuerySQL
(
table
,
fields
,
isGroup
)
+
" LIMIT 0,"
+
limit
;
}
@Override
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
)
+
" LIMIT 0,"
+
limit
;
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
,
isGroup
)
+
" LIMIT 0,"
+
limit
;
}
@Override
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
,
isGroup
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
}
@Override
...
...
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
浏览文件 @
463e45b6
...
...
@@ -80,7 +80,7 @@ public class MysqlQueryProvider extends QueryProvider {
}
@Override
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
)
{
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
SQLObj
tableObj
=
SQLObj
.
builder
()
.
tableName
((
table
.
startsWith
(
"("
)
&&
table
.
endsWith
(
")"
))
?
table
:
String
.
format
(
MySQLConstants
.
KEYWORD_TABLE
,
table
))
.
tableAlias
(
String
.
format
(
TABLE_ALIAS_PREFIX
,
0
))
...
...
@@ -128,34 +128,34 @@ public class MysqlQueryProvider extends QueryProvider {
STGroup
stg
=
new
STGroupFile
(
SQLConstants
.
SQL_TEMPLATE
);
ST
st_sql
=
stg
.
getInstanceOf
(
"querySql"
);
if
(
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
isGroup
&&
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
ObjectUtils
.
isNotEmpty
(
tableObj
))
st_sql
.
add
(
"table"
,
tableObj
);
return
st_sql
.
render
();
}
@Override
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
)
{
return
createQuerySQL
(
"("
+
sqlFix
(
sql
)
+
")"
,
fields
);
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
return
createQuerySQL
(
"("
+
sqlFix
(
sql
)
+
")"
,
fields
,
isGroup
);
}
@Override
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
return
createQuerySQL
(
table
,
fields
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
return
createQuerySQL
(
table
,
fields
,
isGroup
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
}
@Override
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
return
createQuerySQL
(
table
,
fields
)
+
" LIMIT 0,"
+
limit
;
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
createQuerySQL
(
table
,
fields
,
isGroup
)
+
" LIMIT 0,"
+
limit
;
}
@Override
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
)
+
" LIMIT 0,"
+
limit
;
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
,
isGroup
)
+
" LIMIT 0,"
+
limit
;
}
@Override
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
return
createQuerySQLAsTmp
(
sql
,
fields
,
isGroup
)
+
" LIMIT "
+
(
page
-
1
)
*
pageSize
+
","
+
realSize
;
}
@Override
...
...
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
浏览文件 @
463e45b6
...
...
@@ -92,7 +92,7 @@ public class OracleQueryProvider extends QueryProvider {
}
@Override
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
)
{
public
String
createQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
SQLObj
tableObj
=
SQLObj
.
builder
()
.
tableName
((
table
.
startsWith
(
"("
)
&&
table
.
endsWith
(
")"
))
?
table
:
String
.
format
(
OracleConstants
.
KEYWORD_TABLE
,
table
))
.
tableAlias
(
String
.
format
(
OracleConstants
.
ALIAS_FIX
,
String
.
format
(
TABLE_ALIAS_PREFIX
,
0
)))
...
...
@@ -101,7 +101,7 @@ public class OracleQueryProvider extends QueryProvider {
STGroup
stg
=
new
STGroupFile
(
SQLConstants
.
SQL_TEMPLATE
);
ST
st_sql
=
stg
.
getInstanceOf
(
"querySql"
);
if
(
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
isGroup
&&
CollectionUtils
.
isNotEmpty
(
xFields
))
st_sql
.
add
(
"groups"
,
xFields
);
if
(
ObjectUtils
.
isNotEmpty
(
tableObj
))
st_sql
.
add
(
"table"
,
tableObj
);
return
st_sql
.
render
();
}
...
...
@@ -163,33 +163,33 @@ public class OracleQueryProvider extends QueryProvider {
}
@Override
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
)
{
return
createQuerySQL
(
"("
+
sqlFix
(
sql
)
+
")"
,
fields
);
public
String
createQuerySQLAsTmp
(
String
sql
,
List
<
DatasetTableField
>
fields
,
boolean
isGroup
)
{
return
createQuerySQL
(
"("
+
sqlFix
(
sql
)
+
")"
,
fields
,
isGroup
);
}
@Override
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
public
String
createQuerySQLWithPage
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
List
<
SQLObj
>
xFields
=
xFields
(
table
,
fields
);
return
MessageFormat
.
format
(
"SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} "
,
sqlColumn
(
xFields
),
createQuerySQL
(
table
,
fields
),
Integer
.
valueOf
(
page
*
realSize
).
toString
(),
Integer
.
valueOf
((
page
-
1
)
*
pageSize
).
toString
());
sqlColumn
(
xFields
),
createQuerySQL
(
table
,
fields
,
isGroup
),
Integer
.
valueOf
(
page
*
realSize
).
toString
(),
Integer
.
valueOf
((
page
-
1
)
*
pageSize
).
toString
());
}
@Override
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
public
String
createQueryTableWithLimit
(
String
table
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
String
.
format
(
"SELECT %s.* from %s WHERE rownum <= %s "
,
table
,
table
,
limit
.
toString
());
}
@Override
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
)
{
public
String
createQuerySqlWithLimit
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
limit
,
boolean
isGroup
)
{
return
String
.
format
(
"SELECT * from %s WHERE rownum <= %s "
,
"("
+
sqlFix
(
sql
)
+
")"
,
limit
.
toString
());
}
@Override
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
)
{
public
String
createQuerySQLAsTmpWithPage
(
String
sql
,
List
<
DatasetTableField
>
fields
,
Integer
page
,
Integer
pageSize
,
Integer
realSize
,
boolean
isGroup
)
{
List
<
SQLObj
>
xFields
=
xFields
(
"("
+
sqlFix
(
sql
)
+
")"
,
fields
);
return
MessageFormat
.
format
(
"SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} "
,
sqlColumn
(
xFields
),
createQuerySQLAsTmp
(
sql
,
fields
),
Integer
.
valueOf
(
page
*
realSize
).
toString
(),
Integer
.
valueOf
((
page
-
1
)
*
pageSize
).
toString
());
sqlColumn
(
xFields
),
createQuerySQLAsTmp
(
sql
,
fields
,
isGroup
),
Integer
.
valueOf
(
page
*
realSize
).
toString
(),
Integer
.
valueOf
((
page
-
1
)
*
pageSize
).
toString
());
}
@Override
...
...
backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
浏览文件 @
463e45b6
差异被折叠。
点击展开。
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
463e45b6
...
...
@@ -329,14 +329,15 @@ public class DataSetTableService {
datasourceRequest
.
setDatasource
(
ds
);
String
table
=
dataTableInfoDTO
.
getTable
();
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
datasourceProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
datasourceProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -352,14 +353,15 @@ public class DataSetTableService {
datasourceRequest
.
setDatasource
(
ds
);
String
table
=
DorisTableUtils
.
dorisName
(
dataSetTableRequest
.
getId
());
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
jdbcProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
jdbcProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -378,14 +380,15 @@ public class DataSetTableService {
String
sql
=
dataTableInfoDTO
.
getSql
();
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLAsTmpWithPage
(
sql
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLAsTmpWithPage
(
sql
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
datasourceProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQuerySqlWithLimit
(
sql
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQuerySqlWithLimit
(
sql
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
datasourceProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -401,14 +404,15 @@ public class DataSetTableService {
datasourceRequest
.
setDatasource
(
ds
);
String
table
=
DorisTableUtils
.
dorisName
(
dataSetTableRequest
.
getId
());
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
jdbcProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
jdbcProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -425,14 +429,15 @@ public class DataSetTableService {
datasourceRequest
.
setDatasource
(
ds
);
String
table
=
DorisTableUtils
.
dorisName
(
dataSetTableRequest
.
getId
());
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
jdbcProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
jdbcProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -452,14 +457,15 @@ public class DataSetTableService {
String
sql
=
getCustomSQLDatasource
(
dt
,
list
,
ds
);
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLAsTmpWithPage
(
sql
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLAsTmpWithPage
(
sql
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
datasourceProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQuerySqlWithLimit
(
sql
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQuerySqlWithLimit
(
sql
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
datasourceProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -471,7 +477,8 @@ public class DataSetTableService {
datasourceRequest
.
setDatasource
(
ds
);
String
table
=
DorisTableUtils
.
dorisName
(
dataSetTableRequest
.
getId
());
QueryProvider
qp
=
ProviderFactory
.
getQueryProvider
(
ds
.
getType
());
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
));
datasourceRequest
.
setQuery
(
qp
.
createQuerySQLWithPage
(
table
,
fields
,
page
,
pageSize
,
realSize
,
false
));
map
.
put
(
"sql"
,
datasourceRequest
.
getQuery
());
try
{
data
.
addAll
(
jdbcProvider
.
getData
(
datasourceRequest
));
}
catch
(
Exception
e
)
{
...
...
@@ -479,7 +486,7 @@ public class DataSetTableService {
}
try
{
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())));
datasourceRequest
.
setQuery
(
qp
.
createQueryTableWithLimit
(
table
,
fields
,
Integer
.
valueOf
(
dataSetTableRequest
.
getRow
())
,
false
));
dataSetPreviewPage
.
setTotal
(
jdbcProvider
.
getData
(
datasourceRequest
).
size
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论