Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
345f59a5
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
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,发现更多精彩内容 >>
提交
345f59a5
编写于
1月 04, 2021
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
设计搜索条件下层到设计元素(流程、表单或脚本等)
上级
6163ba0e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
239 addition
and
107 deletion
+239
-107
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WiDesigner.java
...c/main/java/com/x/base/core/project/jaxrs/WiDesigner.java
+84
-10
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/designer/ActionSearch.java
...m/x/cms/assemble/control/jaxrs/designer/ActionSearch.java
+20
-10
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/designer/ActionSearch.java
...portal/assemble/designer/jaxrs/designer/ActionSearch.java
+27
-14
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/designer/ActionSearch.java
...atform/assemble/designer/jaxrs/designer/ActionSearch.java
+28
-16
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/designer/ActionSearch.java
...ava/com/x/program/center/jaxrs/designer/ActionSearch.java
+22
-9
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java
.../query/assemble/designer/jaxrs/designer/ActionSearch.java
+40
-24
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java
...x/query/service/processing/jaxrs/design/ActionSearch.java
+18
-18
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/DesignAction.java
...x/query/service/processing/jaxrs/design/DesignAction.java
+0
-6
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WiDesigner.java
浏览文件 @
345f59a5
...
...
@@ -2,11 +2,9 @@ package com.x.base.core.project.jaxrs;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
public
class
WiDesigner
extends
GsonPropertyObject
{
...
...
@@ -20,8 +18,8 @@ public class WiDesigner extends GsonPropertyObject {
private
Boolean
matchRegExp
;
@FieldDescribe
(
"设计类型:script|form|page|widget|process"
)
private
List
<
String
>
designerTypes
=
new
ArrayList
<>();
@FieldDescribe
(
"
应用ID
列表."
)
private
List
<
String
>
appId
List
=
new
ArrayList
<>();
@FieldDescribe
(
"
模块的应用
列表."
)
private
List
<
ModuleApp
>
moduleApp
List
=
new
ArrayList
<>();
public
String
getKeyword
()
{
return
keyword
;
...
...
@@ -63,11 +61,87 @@ public class WiDesigner extends GsonPropertyObject {
this
.
designerTypes
=
designerTypes
;
}
public
List
<
String
>
getAppId
List
()
{
return
appIdList
==
null
?
new
ArrayList
<>()
:
appId
List
;
public
List
<
ModuleApp
>
getModuleApp
List
()
{
return
moduleAppList
==
null
?
new
ArrayList
<>()
:
moduleApp
List
;
}
public
void
setAppIdList
(
List
<
String
>
appIdList
)
{
this
.
appIdList
=
appIdList
;
public
void
setModuleAppList
(
List
<
ModuleApp
>
moduleAppList
)
{
this
.
moduleAppList
=
moduleAppList
;
}
public
List
<
String
>
getAppIdList
(){
Set
<
String
>
set
=
new
HashSet
<>();
for
(
ModuleApp
app
:
this
.
getModuleAppList
()){
set
.
add
(
app
.
getAppId
());
}
return
new
ArrayList
<>(
set
);
}
public
Map
<
String
,
List
<
String
>>
getAppDesigner
(){
Map
<
String
,
List
<
String
>>
map
=
new
HashMap
<>();
for
(
ModuleApp
app
:
this
.
getModuleAppList
()){
for
(
Designer
designer
:
app
.
getDesignerList
()){
String
designerType
=
designer
.
getDesignerType
();
if
(
StringUtils
.
isNotBlank
(
designerType
)){
if
(
map
.
containsKey
(
designerType
)){
map
.
get
(
designerType
).
addAll
(
designer
.
getDesignerIdList
());
}
else
{
if
(!
designer
.
getDesignerIdList
().
isEmpty
())
{
map
.
put
(
designerType
,
designer
.
getDesignerIdList
());
}
}
}
}
}
return
map
;
}
public
class
ModuleApp
extends
GsonPropertyObject
{
@FieldDescribe
(
"应用ID."
)
private
String
appId
;
@FieldDescribe
(
"设计列表."
)
private
List
<
Designer
>
designerList
;
public
String
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
String
appId
)
{
this
.
appId
=
appId
;
}
public
List
<
Designer
>
getDesignerList
()
{
return
designerList
==
null
?
new
ArrayList
<>()
:
designerList
;
}
public
void
setDesignerList
(
List
<
Designer
>
designerList
)
{
this
.
designerList
=
designerList
;
}
}
public
class
Designer
extends
GsonPropertyObject
{
@FieldDescribe
(
"设计类型."
)
private
String
designerType
;
@FieldDescribe
(
"设计ID列表."
)
private
List
<
String
>
designerIdList
;
public
String
getDesignerType
()
{
return
designerType
;
}
public
void
setDesignerType
(
String
designerType
)
{
this
.
designerType
=
designerType
;
}
public
List
<
String
>
getDesignerIdList
()
{
return
designerIdList
==
null
?
new
ArrayList
<>()
:
designerIdList
;
}
public
void
setDesignerIdList
(
List
<
String
>
designerIdList
)
{
this
.
designerIdList
=
designerIdList
;
}
}
}
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/designer/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -46,11 +46,15 @@ class ActionSearch extends BaseAction {
List
<
Wo
>
resWos
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
Wo
>>>
list
=
new
ArrayList
<>();
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
form
.
toString
())){
list
.
add
(
searchForm
(
wi
,
wi
.
getAppIdList
()));
Map
<
String
,
List
<
String
>>
designerMap
=
wi
.
getAppDesigner
();
List
<
String
>
appList
=
wi
.
getAppIdList
();
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
form
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
form
.
toString
()))){
list
.
add
(
searchForm
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
form
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
())){
list
.
add
(
searchScript
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
script
.
toString
()))){
list
.
add
(
searchScript
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
script
.
toString
())));
}
for
(
CompletableFuture
<
List
<
Wo
>>
cf
:
list
){
if
(
resWos
.
size
()<
50
)
{
...
...
@@ -65,15 +69,18 @@ class ActionSearch extends BaseAction {
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoScript
>
woScripts
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woScripts
=
emc
.
fetch
All
(
Script
.
class
,
WoScript
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woScripts
=
emc
.
fetch
In
(
Script
.
class
,
WoScript
.
copier
,
Script
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woScripts
=
emc
.
fetchIn
(
Script
.
class
,
WoScript
.
copier
,
Script
.
appId_FIELDNAME
,
appIdList
);
}
else
{
woScripts
=
emc
.
fetchAll
(
Script
.
class
,
WoScript
.
copier
);
}
for
(
WoScript
woScript
:
woScripts
)
{
...
...
@@ -103,12 +110,15 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchForm
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchForm
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
formIds
=
business
.
getFormFactory
().
listByAppIds
(
appIdList
);
List
<
String
>
formIds
=
designerIdList
;
if
(
ListTools
.
isEmpty
(
formIds
))
{
formIds
=
business
.
getFormFactory
().
listByAppIds
(
appIdList
);
}
for
(
List
<
String
>
partFormIds
:
ListTools
.
batch
(
formIds
,
100
))
{
List
<
WoForm
>
woForms
=
emc
.
fetchIn
(
Form
.
class
,
WoForm
.
copier
,
Form
.
id_FIELDNAME
,
partFormIds
);
for
(
WoForm
woForm
:
woForms
)
{
...
...
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/designer/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -46,14 +46,19 @@ class ActionSearch extends BaseAction {
List
<
Wo
>
resWos
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
Wo
>>>
list
=
new
ArrayList
<>();
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
form
.
toString
())){
list
.
add
(
searchPage
(
wi
,
wi
.
getAppIdList
()));
Map
<
String
,
List
<
String
>>
designerMap
=
wi
.
getAppDesigner
();
List
<
String
>
appList
=
wi
.
getAppIdList
();
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
page
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
page
.
toString
()))){
list
.
add
(
searchPage
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
page
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
())){
list
.
add
(
searchScript
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
script
.
toString
()))){
list
.
add
(
searchScript
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
script
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
widget
.
toString
())){
list
.
add
(
searchWidget
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
widget
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
widget
.
toString
()))){
list
.
add
(
searchWidget
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
widget
.
toString
())));
}
for
(
CompletableFuture
<
List
<
Wo
>>
cf
:
list
){
if
(
resWos
.
size
()<
50
)
{
...
...
@@ -68,15 +73,17 @@ class ActionSearch extends BaseAction {
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoScript
>
woScripts
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woScripts
=
emc
.
fetch
All
(
Script
.
class
,
WoScript
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woScripts
=
emc
.
fetch
In
(
Script
.
class
,
WoScript
.
copier
,
Script
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woScripts
=
emc
.
fetchIn
(
Script
.
class
,
WoScript
.
copier
,
Script
.
portal_FIELDNAME
,
appIdList
);
}
else
{
woScripts
=
emc
.
fetchAll
(
Script
.
class
,
WoScript
.
copier
);
}
for
(
WoScript
woScript
:
woScripts
)
{
...
...
@@ -106,12 +113,15 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchPage
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchPage
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
ids
=
business
.
page
().
listWithPortals
(
appIdList
);
List
<
String
>
ids
=
designerIdList
;
if
(
ListTools
.
isEmpty
(
ids
))
{
ids
=
business
.
page
().
listWithPortals
(
appIdList
);
}
for
(
List
<
String
>
partIds
:
ListTools
.
batch
(
ids
,
100
))
{
List
<
WoPage
>
wos
=
emc
.
fetchIn
(
Page
.
class
,
WoPage
.
copier
,
Page
.
id_FIELDNAME
,
partIds
);
for
(
WoPage
wopage
:
wos
)
{
...
...
@@ -143,12 +153,15 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchWidget
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchWidget
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
ids
=
business
.
widget
().
listWithPortals
(
appIdList
);
List
<
String
>
ids
=
designerIdList
;
if
(
ListTools
.
isEmpty
(
ids
))
{
ids
=
business
.
widget
().
listWithPortals
(
appIdList
);
}
for
(
List
<
String
>
partIds
:
ListTools
.
batch
(
ids
,
100
))
{
List
<
WoWidget
>
wos
=
emc
.
fetchIn
(
Widget
.
class
,
WoWidget
.
copier
,
WoWidget
.
id_FIELDNAME
,
partIds
);
for
(
WoWidget
woWidget
:
wos
)
{
...
...
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/designer/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -47,14 +47,19 @@ class ActionSearch extends BaseAction {
List
<
Wo
>
resWos
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
Wo
>>>
list
=
new
ArrayList
<>();
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
form
.
toString
())){
list
.
add
(
searchForm
(
wi
,
wi
.
getAppIdList
()));
Map
<
String
,
List
<
String
>>
designerMap
=
wi
.
getAppDesigner
();
List
<
String
>
appList
=
wi
.
getAppIdList
();
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
form
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
form
.
toString
()))){
list
.
add
(
searchForm
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
form
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
())){
list
.
add
(
searchScript
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
script
.
toString
()))){
list
.
add
(
searchScript
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
script
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
process
.
toString
())){
resWos
.
addAll
(
searchProcess
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
process
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
process
.
toString
()))){
resWos
.
addAll
(
searchProcess
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
process
.
toString
())));
}
for
(
CompletableFuture
<
List
<
Wo
>>
cf
:
list
){
if
(
resWos
.
size
()<
50
)
{
...
...
@@ -69,15 +74,17 @@ class ActionSearch extends BaseAction {
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchScript
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoScript
>
woScripts
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woScripts
=
emc
.
fetch
All
(
Script
.
class
,
WoScript
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woScripts
=
emc
.
fetch
In
(
Script
.
class
,
WoScript
.
copier
,
Script
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woScripts
=
emc
.
fetchIn
(
Script
.
class
,
WoScript
.
copier
,
Script
.
application_FIELDNAME
,
appIdList
);
}
else
{
woScripts
=
emc
.
fetchAll
(
Script
.
class
,
WoScript
.
copier
);
}
for
(
WoScript
woScript
:
woScripts
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoScript
.
copier
.
getCopyFields
(),
woScript
,
wi
.
getKeyword
(),
...
...
@@ -106,12 +113,15 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchForm
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchForm
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
formIds
=
business
.
form
().
listWithApplications
(
appIdList
);
List
<
String
>
formIds
=
designerIdList
;
if
(
ListTools
.
isEmpty
(
formIds
))
{
formIds
=
business
.
form
().
listWithApplications
(
appIdList
);
}
for
(
List
<
String
>
partFormIds
:
ListTools
.
batch
(
formIds
,
100
))
{
List
<
WoForm
>
woForms
=
emc
.
fetchIn
(
Form
.
class
,
WoForm
.
copier
,
Form
.
id_FIELDNAME
,
partFormIds
);
for
(
WoForm
woForm
:
woForms
)
{
...
...
@@ -143,12 +153,14 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
List
<
Wo
>
searchProcess
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
List
<
Wo
>
searchProcess
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
List
<
List
<
String
>>
batchList
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
processIds
=
business
.
process
().
listWithApplications
(
appIdList
);
List
<
String
>
processIds
=
designerIdList
;
if
(
ListTools
.
isEmpty
(
processIds
))
{
Business
business
=
new
Business
(
emc
);
processIds
=
business
.
process
().
listWithApplications
(
appIdList
);
}
batchList
=
ListTools
.
batch
(
processIds
,
20
);
}
catch
(
Exception
e
){
logger
.
error
(
e
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/designer/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -43,12 +43,15 @@ class ActionSearch extends BaseAction {
List
<
Wo
>
resWos
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
Wo
>>>
list
=
new
ArrayList
<>();
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
())){
if
(
wi
.
getAppIdList
().
isEmpty
()
||
wi
.
getAppIdList
().
contains
(
"invoke"
))
{
list
.
add
(
searchInvoke
(
wi
));
Map
<
String
,
List
<
String
>>
designerMap
=
wi
.
getAppDesigner
();
List
<
String
>
appList
=
wi
.
getAppIdList
();
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
script
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
script
.
toString
()))){
if
(
appList
.
isEmpty
()
||
appList
.
contains
(
"invoke"
))
{
list
.
add
(
searchInvoke
(
wi
,
designerMap
.
get
(
DesignerType
.
script
.
toString
())));
}
if
(
wi
.
getAppIdList
().
isEmpty
()
||
wi
.
getAppIdList
()
.
contains
(
"agent"
))
{
list
.
add
(
searchAgent
(
wi
));
if
(
appList
.
isEmpty
()
||
appList
.
contains
(
"agent"
))
{
list
.
add
(
searchAgent
(
wi
,
designerMap
.
get
(
DesignerType
.
script
.
toString
())
));
}
}
for
(
CompletableFuture
<
List
<
Wo
>>
cf
:
list
){
...
...
@@ -64,11 +67,16 @@ class ActionSearch extends BaseAction {
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchAgent
(
final
Wi
wi
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchAgent
(
final
Wi
wi
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoAgent
>
woAgents
=
emc
.
fetchAll
(
Agent
.
class
,
WoAgent
.
copier
);
List
<
WoAgent
>
woAgents
;
if
(
ListTools
.
isNotEmpty
(
designerIdList
))
{
woAgents
=
emc
.
fetchIn
(
Agent
.
class
,
WoAgent
.
copier
,
Agent
.
id_FIELDNAME
,
designerIdList
);
}
else
{
woAgents
=
emc
.
fetchAll
(
Agent
.
class
,
WoAgent
.
copier
);
}
for
(
WoAgent
woAgent
:
woAgents
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoAgent
.
copier
.
getCopyFields
(),
woAgent
,
wi
.
getKeyword
(),
wi
.
getCaseSensitive
(),
wi
.
getMatchWholeWord
(),
wi
.
getMatchRegExp
());
...
...
@@ -93,11 +101,16 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchInvoke
(
final
Wi
wi
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchInvoke
(
final
Wi
wi
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoInvoke
>
woInvokes
=
emc
.
fetchAll
(
Invoke
.
class
,
WoInvoke
.
copier
);
List
<
WoInvoke
>
woInvokes
;
if
(
ListTools
.
isNotEmpty
(
designerIdList
))
{
woInvokes
=
emc
.
fetchIn
(
Invoke
.
class
,
WoInvoke
.
copier
,
Invoke
.
id_FIELDNAME
,
designerIdList
);
}
else
{
woInvokes
=
emc
.
fetchAll
(
Invoke
.
class
,
WoInvoke
.
copier
);
}
for
(
WoInvoke
woInvoke
:
woInvokes
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoInvoke
.
copier
.
getCopyFields
(),
woInvoke
,
wi
.
getKeyword
(),
wi
.
getCaseSensitive
(),
wi
.
getMatchWholeWord
(),
wi
.
getMatchRegExp
());
...
...
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -46,18 +46,26 @@ class ActionSearch extends BaseAction {
List
<
Wo
>
resWos
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
Wo
>>>
list
=
new
ArrayList
<>();
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
view
.
toString
())){
list
.
add
(
searchView
(
wi
,
wi
.
getAppIdList
()));
Map
<
String
,
List
<
String
>>
designerMap
=
wi
.
getAppDesigner
();
List
<
String
>
appList
=
wi
.
getAppIdList
();
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
view
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
view
.
toString
()))){
list
.
add
(
searchView
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
view
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
table
.
toString
())){
list
.
add
(
searchTable
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
table
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
table
.
toString
()))){
list
.
add
(
searchTable
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
table
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
statement
.
toString
())){
list
.
add
(
searchStatement
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
statement
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
statement
.
toString
()))){
list
.
add
(
searchStatement
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
statement
.
toString
())));
}
if
(
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
stat
.
toString
())){
list
.
add
(
searchStat
(
wi
,
wi
.
getAppIdList
()));
if
((
wi
.
getDesignerTypes
().
isEmpty
()
||
wi
.
getDesignerTypes
().
contains
(
DesignerType
.
stat
.
toString
()))
&&
(
designerMap
.
isEmpty
()
||
designerMap
.
containsKey
(
DesignerType
.
stat
.
toString
()))){
list
.
add
(
searchStat
(
wi
,
appList
,
designerMap
.
get
(
DesignerType
.
stat
.
toString
())));
}
for
(
CompletableFuture
<
List
<
Wo
>>
cf
:
list
){
if
(
resWos
.
size
()<
50
)
{
resWos
.
addAll
(
cf
.
get
(
60
,
TimeUnit
.
SECONDS
));
...
...
@@ -71,15 +79,17 @@ class ActionSearch extends BaseAction {
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchView
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchView
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoView
>
woViews
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woViews
=
emc
.
fetch
All
(
View
.
class
,
WoView
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woViews
=
emc
.
fetch
In
(
View
.
class
,
WoView
.
copier
,
View
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woViews
=
emc
.
fetchIn
(
View
.
class
,
WoView
.
copier
,
View
.
query_FIELDNAME
,
appIdList
);
}
else
{
woViews
=
emc
.
fetchAll
(
View
.
class
,
WoView
.
copier
);
}
for
(
WoView
woView
:
woViews
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoView
.
copier
.
getCopyFields
(),
woView
,
wi
.
getKeyword
(),
...
...
@@ -108,15 +118,17 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchTable
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchTable
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoTable
>
woTables
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woTables
=
emc
.
fetch
All
(
Table
.
class
,
WoTable
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woTables
=
emc
.
fetch
In
(
Table
.
class
,
WoTable
.
copier
,
Table
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woTables
=
emc
.
fetchIn
(
Table
.
class
,
WoTable
.
copier
,
Table
.
query_FIELDNAME
,
appIdList
);
}
else
{
woTables
=
emc
.
fetchAll
(
Table
.
class
,
WoTable
.
copier
);
}
for
(
WoTable
woTable
:
woTables
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoTable
.
copier
.
getCopyFields
(),
woTable
,
wi
.
getKeyword
(),
...
...
@@ -145,15 +157,17 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchStat
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchStat
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoStat
>
woStats
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woStats
=
emc
.
fetch
All
(
Stat
.
class
,
WoStat
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woStats
=
emc
.
fetch
In
(
Stat
.
class
,
WoStat
.
copier
,
Stat
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woStats
=
emc
.
fetchIn
(
Stat
.
class
,
WoStat
.
copier
,
Stat
.
query_FIELDNAME
,
appIdList
);
}
else
{
woStats
=
emc
.
fetchAll
(
Stat
.
class
,
WoStat
.
copier
);
}
for
(
WoStat
woStat
:
woStats
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoStat
.
copier
.
getCopyFields
(),
woStat
,
wi
.
getKeyword
(),
...
...
@@ -182,15 +196,17 @@ class ActionSearch extends BaseAction {
return
cf
;
}
private
CompletableFuture
<
List
<
Wo
>>
searchStatement
(
final
Wi
wi
,
final
List
<
String
>
appIdList
)
{
private
CompletableFuture
<
List
<
Wo
>>
searchStatement
(
final
Wi
wi
,
final
List
<
String
>
appIdList
,
final
List
<
String
>
designerIdList
)
{
CompletableFuture
<
List
<
Wo
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
resWos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WoStatement
>
woStatements
;
if
(
ListTools
.
is
Empty
(
app
IdList
))
{
woStatements
=
emc
.
fetch
All
(
Statement
.
class
,
WoStatement
.
copier
);
}
else
{
if
(
ListTools
.
is
NotEmpty
(
designer
IdList
))
{
woStatements
=
emc
.
fetch
In
(
Statement
.
class
,
WoStatement
.
copier
,
Statement
.
id_FIELDNAME
,
designerIdList
);
}
else
if
(
ListTools
.
isNotEmpty
(
appIdList
))
{
woStatements
=
emc
.
fetchIn
(
Statement
.
class
,
WoStatement
.
copier
,
Statement
.
query_FIELDNAME
,
appIdList
);
}
else
{
woStatements
=
emc
.
fetchAll
(
Statement
.
class
,
WoStatement
.
copier
);
}
for
(
WoStatement
woStatement
:
woStatements
)
{
Map
<
String
,
String
>
map
=
PropertyTools
.
fieldMatchKeyword
(
WoStatement
.
copier
.
getCopyFields
(),
woStatement
,
wi
.
getKeyword
(),
...
...
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java
浏览文件 @
345f59a5
...
...
@@ -37,27 +37,27 @@ class ActionSearch extends BaseAction {
}
private
Wo
search
(
final
Wi
wi
)
{
final
Map
<
String
,
List
<
String
>>
moduleMap
=
new
HashMap
<>();
final
Map
<
String
,
List
<
WiDesigner
.
ModuleApp
>>
moduleMap
=
new
HashMap
<>();
if
(!
ListTools
.
isEmpty
(
wi
.
getModuleList
())){
for
(
Module
module:
wi
.
getModuleList
()){
if
(
module
.
getModuleType
().
equalsIgnoreCase
(
ModuleType
.
cms
.
toString
())){
moduleMap
.
put
(
ModuleType
.
cms
.
toString
(),
module
.
get
Flag
List
());
moduleMap
.
put
(
ModuleType
.
cms
.
toString
(),
module
.
get
ModuleApp
List
());
}
if
(
module
.
getModuleType
().
equalsIgnoreCase
(
ModuleType
.
portal
.
toString
())){
moduleMap
.
put
(
ModuleType
.
portal
.
toString
(),
module
.
get
Flag
List
());
moduleMap
.
put
(
ModuleType
.
portal
.
toString
(),
module
.
get
ModuleApp
List
());
}
if
(
module
.
getModuleType
().
equalsIgnoreCase
(
ModuleType
.
processPlatform
.
toString
())){
moduleMap
.
put
(
ModuleType
.
processPlatform
.
toString
(),
module
.
get
Flag
List
());
moduleMap
.
put
(
ModuleType
.
processPlatform
.
toString
(),
module
.
get
ModuleApp
List
());
}
if
(
module
.
getModuleType
().
equalsIgnoreCase
(
ModuleType
.
query
.
toString
())){
moduleMap
.
put
(
ModuleType
.
query
.
toString
(),
module
.
get
Flag
List
());
moduleMap
.
put
(
ModuleType
.
query
.
toString
(),
module
.
get
ModuleApp
List
());
}
if
(
module
.
getModuleType
().
equalsIgnoreCase
(
ModuleType
.
service
.
toString
())){
moduleMap
.
put
(
ModuleType
.
service
.
toString
(),
module
.
get
Flag
List
());
moduleMap
.
put
(
ModuleType
.
service
.
toString
(),
module
.
get
ModuleApp
List
());
}
}
}
else
{
List
<
String
>
list
=
new
ArrayList
<>();
List
<
WiDesigner
.
ModuleApp
>
list
=
new
ArrayList
<>();
moduleMap
.
put
(
ModuleType
.
cms
.
toString
(),
list
);
moduleMap
.
put
(
ModuleType
.
portal
.
toString
(),
list
);
moduleMap
.
put
(
ModuleType
.
processPlatform
.
toString
(),
list
);
...
...
@@ -99,14 +99,14 @@ class ActionSearch extends BaseAction {
return
wo
;
}
private
CompletableFuture
<
List
<
WrapDesigner
>>
searchAsync
(
final
Wi
wi
,
final
Map
<
String
,
List
<
String
>>
moduleMap
,
final
String
moduleType
,
final
Class
<?>
applicationClass
,
Executor
executor
){
private
CompletableFuture
<
List
<
WrapDesigner
>>
searchAsync
(
final
Wi
wi
,
final
Map
<
String
,
List
<
WiDesigner
.
ModuleApp
>>
moduleMap
,
final
String
moduleType
,
final
Class
<?>
applicationClass
,
Executor
executor
){
CompletableFuture
<
List
<
WrapDesigner
>>
cf
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
WrapDesigner
>
swList
=
new
ArrayList
<>();
if
(
moduleMap
.
containsKey
(
moduleType
))
{
try
{
WiDesigner
wiDesigner
=
new
WiDesigner
();
BeanUtils
.
copyProperties
(
wiDesigner
,
wi
);
wiDesigner
.
set
AppId
List
(
moduleMap
.
get
(
moduleType
));
wiDesigner
.
set
ModuleApp
List
(
moduleMap
.
get
(
moduleType
));
List
<
WrapDesigner
>
designerList
=
ThisApplication
.
context
().
applications
().
postQuery
(
applicationClass
,
Applications
.
joinQueryUri
(
"designer"
,
"search"
),
wiDesigner
).
getDataAsList
(
WrapDesigner
.
class
);
logger
.
info
(
"设计搜索关联{}的匹配设计个数:{}"
,
moduleType
,
designerList
.
size
());
...
...
@@ -146,7 +146,7 @@ class ActionSearch extends BaseAction {
@FieldDescribe
(
"搜索关键字."
)
private
String
keyword
;
@FieldDescribe
(
"搜索设计类型:script|form|page|widget|process"
)
@FieldDescribe
(
"搜索设计类型:script|form|page|widget|process
|view|table|stat|statement
"
)
private
List
<
String
>
designerTypes
;
@FieldDescribe
(
"是否区分大小写."
)
private
Boolean
caseSensitive
;
...
...
@@ -154,8 +154,8 @@ class ActionSearch extends BaseAction {
private
Boolean
matchWholeWord
;
@FieldDescribe
(
"是否正则表达式匹配."
)
private
Boolean
matchRegExp
;
@FieldDescribe
(
"限制查询的模块列表(模块类型:processPlatform|cms|portal|query|service)
.
"
)
@FieldTypeDescribe
(
fieldType
=
"class"
,
fieldTypeName
=
"Module"
,
fieldValue
=
"{\"moduleType\": \"
cms\", \"flagList\": [
]}"
)
@FieldDescribe
(
"限制查询的模块列表(模块类型:processPlatform|cms|portal|query|service)
<br/>\r\n
"
)
@FieldTypeDescribe
(
fieldType
=
"class"
,
fieldTypeName
=
"Module"
,
fieldValue
=
"{\"moduleType\": \"
processPlatform\", \"moduleAppList\": [{\"appId\":\"\", \"designerList\": [{\"designerType\":\"process\", \"designerIdList\": []}]}
]}"
)
private
List
<
Module
>
moduleList
;
public
String
getKeyword
()
{
...
...
@@ -208,17 +208,17 @@ class ActionSearch extends BaseAction {
}
public
static
class
Module
extends
GsonPropertyObject
{
@FieldDescribe
(
"模块的应用
id
列表."
)
private
List
<
String
>
flagList
;
@FieldDescribe
(
"模块的应用列表."
)
private
List
<
WiDesigner
.
ModuleApp
>
moduleAppList
=
new
ArrayList
<>()
;
@FieldDescribe
(
"模块类型."
)
private
String
moduleType
;
public
List
<
String
>
getFlag
List
()
{
return
flagList
==
null
?
new
ArrayList
<>()
:
flag
List
;
public
List
<
WiDesigner
.
ModuleApp
>
getModuleApp
List
()
{
return
moduleApp
List
;
}
public
void
set
FlagList
(
List
<
String
>
flag
List
)
{
this
.
flagList
=
flag
List
;
public
void
set
ModuleAppList
(
List
<
WiDesigner
.
ModuleApp
>
moduleApp
List
)
{
this
.
moduleAppList
=
moduleApp
List
;
}
public
String
getModuleType
()
{
...
...
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/DesignAction.java
浏览文件 @
345f59a5
...
...
@@ -17,7 +17,6 @@ import javax.ws.rs.container.AsyncResponse;
import
javax.ws.rs.container.Suspended
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
java.util.concurrent.locks.ReentrantLock
;
@Path
(
"design"
)
@JaxrsDescribe
(
"全平台设计"
)
...
...
@@ -25,8 +24,6 @@ public class DesignAction extends StandardJaxrsAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
DesignAction
.
class
);
private
static
ReentrantLock
lock
=
new
ReentrantLock
();
@JaxrsMethodDescribe
(
value
=
"全平台设计搜索."
,
action
=
ActionSearch
.
class
)
@POST
@Path
(
"search"
)
...
...
@@ -36,14 +33,11 @@ public class DesignAction extends StandardJaxrsAction {
JsonElement
jsonElement
)
{
ActionResult
<
ActionSearch
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
lock
.
lock
();
try
{
result
=
new
ActionSearch
().
execute
(
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
finally
{
lock
.
unlock
();
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录