Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
ab063c4d
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ab063c4d
编写于
7月 08, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
取消视图bundle查询2000条限制
上级
f3be910a
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
35 addition
and
18 deletion
+35
-18
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java
...om/x/query/assemble/designer/jaxrs/view/ActionBundle.java
+1
-1
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java
.../x/query/assemble/designer/jaxrs/view/ActionSimulate.java
+1
-1
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java
.../com/x/query/assemble/designer/jaxrs/view/BaseAction.java
+13
-5
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundle.java
...com/x/query/assemble/surface/jaxrs/view/ActionBundle.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundleWithQuery.java
...ry/assemble/surface/jaxrs/view/ActionBundleWithQuery.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcel.java
.../com/x/query/assemble/surface/jaxrs/view/ActionExcel.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcelWithQuery.java
...ery/assemble/surface/jaxrs/view/ActionExcelWithQuery.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecute.java
...om/x/query/assemble/surface/jaxrs/view/ActionExecute.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecuteWithQuery.java
...y/assemble/surface/jaxrs/view/ActionExecuteWithQuery.java
+2
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java
...a/com/x/query/assemble/surface/jaxrs/view/BaseAction.java
+13
-5
未找到文件。
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java
浏览文件 @
ab063c4d
...
...
@@ -39,7 +39,7 @@ class ActionBundle extends BaseAction {
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
()
,
true
);
List
<
String
>
os
=
null
;
switch
(
StringUtils
.
trimToEmpty
(
view
.
getType
()))
{
...
...
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java
浏览文件 @
ab063c4d
...
...
@@ -41,7 +41,7 @@ class ActionSimulate extends BaseAction {
if
(
wi
==
null
)
{
wi
=
new
Wi
();
}
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
()
,
false
);
runtime
.
bundleList
=
wi
.
getBundleList
();
switch
(
StringUtils
.
trimToEmpty
(
view
.
getType
()))
{
...
...
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java
浏览文件 @
ab063c4d
...
...
@@ -51,7 +51,7 @@ abstract class BaseAction extends StandardJaxrsAction {
}
protected
Runtime
runtime
(
EffectivePerson
effectivePerson
,
Business
business
,
View
view
,
List
<
FilterEntry
>
filterList
,
Map
<
String
,
String
>
parameter
,
Integer
count
)
throws
Exception
{
List
<
FilterEntry
>
filterList
,
Map
<
String
,
String
>
parameter
,
Integer
count
,
boolean
isBundle
)
throws
Exception
{
Runtime
runtime
=
new
Runtime
();
runtime
.
person
=
effectivePerson
.
getDistinguishedName
();
runtime
.
identityList
=
business
.
organization
().
identity
().
listWithPerson
(
effectivePerson
);
...
...
@@ -107,14 +107,22 @@ abstract class BaseAction extends StandardJaxrsAction {
}
runtime
.
parameter
=
parameter
;
runtime
.
filterList
=
filterList
;
runtime
.
count
=
this
.
getCount
(
view
,
count
);
runtime
.
count
=
this
.
getCount
(
view
,
count
,
isBundle
);
return
runtime
;
}
protected
Integer
getCount
(
View
view
,
Integer
count
)
{
protected
Integer
getCount
(
View
view
,
Integer
count
,
boolean
isBundle
)
{
Integer
viewCount
=
view
.
getCount
();
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
)
||
(
count
>
View
.
MAX_COUNT
))
?
View
.
MAX_COUNT
:
count
;
return
NumberUtils
.
min
(
viewCount
,
wiCount
);
if
(
isBundle
)
{
if
(
viewCount
==
null
||
viewCount
<
1
){
viewCount
=
View
.
MAX_COUNT
;
}
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
))
?
viewCount
:
count
;
return
wiCount
;
}
else
{
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
)
||
(
count
>
View
.
MAX_COUNT
))
?
View
.
MAX_COUNT
:
count
;
return
NumberUtils
.
min
(
viewCount
,
wiCount
);
}
}
protected
void
setProcessEdition
(
Business
business
,
ProcessPlatformPlan
processPlatformPlan
)
throws
Exception
{
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundle.java
浏览文件 @
ab063c4d
...
...
@@ -53,7 +53,7 @@ class ActionBundle extends BaseAction {
wi
=
new
Wi
();
}
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
wi
.
getCount
()
,
true
);
List
<
String
>
os
=
this
.
fetchBundle
(
business
,
view
,
runtime
);
Wo
wo
=
new
Wo
();
wo
.
setValueList
(
os
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundleWithQuery.java
浏览文件 @
ab063c4d
...
...
@@ -51,7 +51,7 @@ class ActionBundleWithQuery extends BaseAction {
wi
=
new
Wi
();
}
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
wi
.
getCount
()
,
true
);
Wo
wo
=
new
Wo
();
wo
.
setValueList
(
this
.
fetchBundle
(
business
,
view
,
runtime
));
result
.
setData
(
wo
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcel.java
浏览文件 @
ab063c4d
...
...
@@ -50,7 +50,7 @@ class ActionExcel extends BaseAction {
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
wi
.
getCount
()
,
false
);
runtime
.
bundleList
=
wi
.
getBundleList
();
Plan
plan
=
this
.
accessPlan
(
business
,
view
,
runtime
);
String
excelFlag
=
this
.
girdWriteToExcel
(
effectivePerson
,
business
,
plan
,
view
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcelWithQuery.java
浏览文件 @
ab063c4d
...
...
@@ -48,7 +48,7 @@ class ActionExcelWithQuery extends BaseAction {
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
wi
.
getCount
()
,
false
);
runtime
.
bundleList
=
wi
.
getBundleList
();
Plan
plan
=
this
.
accessPlan
(
business
,
view
,
runtime
);
String
excelFlag
=
this
.
girdWriteToExcel
(
effectivePerson
,
business
,
plan
,
view
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecute.java
浏览文件 @
ab063c4d
...
...
@@ -55,7 +55,7 @@ class ActionExecute extends BaseAction {
wi
=
new
Wi
();
}
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
wi
.
getCount
()
,
false
);
runtime
.
bundleList
=
wi
.
getBundleList
();
Plan
plan
=
this
.
accessPlan
(
business
,
view
,
runtime
);
result
.
setData
(
plan
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecuteWithQuery.java
浏览文件 @
ab063c4d
...
...
@@ -50,7 +50,8 @@ class ActionExecuteWithQuery extends BaseAction {
if
(
null
==
wi
)
{
wi
=
new
Wi
();
}
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
());
Runtime
runtime
=
this
.
runtime
(
effectivePerson
,
business
,
view
,
wi
.
getFilterList
(),
wi
.
getParameter
(),
wi
.
getCount
(),
false
);
runtime
.
bundleList
=
wi
.
getBundleList
();
Plan
plan
=
this
.
accessPlan
(
business
,
view
,
runtime
);
result
.
setData
(
plan
);
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java
浏览文件 @
ab063c4d
...
...
@@ -202,7 +202,7 @@ abstract class BaseAction extends StandardJaxrsAction {
}
protected
Runtime
runtime
(
EffectivePerson
effectivePerson
,
Business
business
,
View
view
,
List
<
FilterEntry
>
filterList
,
Map
<
String
,
String
>
parameter
,
Integer
count
)
throws
Exception
{
List
<
FilterEntry
>
filterList
,
Map
<
String
,
String
>
parameter
,
Integer
count
,
boolean
isBundle
)
throws
Exception
{
Runtime
runtime
=
new
Runtime
();
runtime
.
person
=
effectivePerson
.
getDistinguishedName
();
runtime
.
identityList
=
business
.
organization
().
identity
().
listWithPerson
(
effectivePerson
);
...
...
@@ -258,14 +258,22 @@ abstract class BaseAction extends StandardJaxrsAction {
}
runtime
.
parameter
=
parameter
;
runtime
.
filterList
=
filterList
;
runtime
.
count
=
this
.
getCount
(
view
,
count
);
runtime
.
count
=
this
.
getCount
(
view
,
count
,
isBundle
);
return
runtime
;
}
protected
Integer
getCount
(
View
view
,
Integer
count
)
{
protected
Integer
getCount
(
View
view
,
Integer
count
,
boolean
isBundle
)
{
Integer
viewCount
=
view
.
getCount
();
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
)
||
(
count
>
View
.
MAX_COUNT
))
?
View
.
MAX_COUNT
:
count
;
return
NumberUtils
.
min
(
viewCount
,
wiCount
);
if
(
isBundle
)
{
if
(
viewCount
==
null
||
viewCount
<
1
){
viewCount
=
View
.
MAX_COUNT
;
}
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
))
?
viewCount
:
count
;
return
wiCount
;
}
else
{
Integer
wiCount
=
((
count
==
null
)
||
(
count
<
1
)
||
(
count
>
View
.
MAX_COUNT
))
?
View
.
MAX_COUNT
:
count
;
return
NumberUtils
.
min
(
viewCount
,
wiCount
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录