Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
556eb438
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
556eb438
编写于
12月 25, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
流程平台的表单和脚本、内容管理的表单和脚本、门户的页面和脚本等设计搜索2
上级
ffa74281
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
25 deletion
+23
-25
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
+1
-1
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/designer/ActionSearch.java
...portal/assemble/designer/jaxrs/designer/ActionSearch.java
+1
-1
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/designer/ActionSearch.java
...atform/assemble/designer/jaxrs/designer/ActionSearch.java
+1
-1
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
+20
-22
未找到文件。
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/designer/ActionSearch.java
浏览文件 @
556eb438
...
...
@@ -37,7 +37,7 @@ class ActionSearch extends BaseAction {
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
logger
.
info
(
"{}开始内容管理设计搜索,
条件:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
);
logger
.
info
(
"{}开始内容管理设计搜索,
关键字:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
.
getKeyword
()
);
if
(
StringUtils
.
isBlank
(
wi
.
getKeyword
())){
throw
new
ExceptionFieldEmpty
(
"keyword"
);
}
...
...
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/designer/ActionSearch.java
浏览文件 @
556eb438
...
...
@@ -38,7 +38,7 @@ class ActionSearch extends BaseAction {
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
logger
.
info
(
"{}开始
内容管理设计搜索,条件:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
);
logger
.
info
(
"{}开始
门户设计搜索,关键字:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
.
getKeyword
()
);
if
(
StringUtils
.
isBlank
(
wi
.
getKeyword
())){
throw
new
ExceptionFieldEmpty
(
"keyword"
);
}
...
...
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/designer/ActionSearch.java
浏览文件 @
556eb438
...
...
@@ -38,7 +38,7 @@ class ActionSearch extends BaseAction {
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
logger
.
info
(
"{}开始流程平台设计搜索,
条件:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
);
logger
.
info
(
"{}开始流程平台设计搜索,
关键字:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
.
getKeyword
()
);
if
(
StringUtils
.
isBlank
(
wi
.
getKeyword
())){
throw
new
ExceptionFieldEmpty
(
"keyword"
);
}
...
...
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java
浏览文件 @
556eb438
...
...
@@ -5,7 +5,6 @@ import com.x.base.core.project.Applications;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.annotation.FieldTypeDescribe
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WiDesigner
;
...
...
@@ -14,7 +13,6 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.SortTools
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.base.core.project.x_cms_assemble_control
;
import
com.x.base.core.project.x_portal_assemble_designer
;
import
com.x.base.core.project.x_processplatform_assemble_designer
;
...
...
@@ -36,7 +34,7 @@ class ActionSearch extends BaseAction {
if
(
StringUtils
.
isBlank
(
wi
.
getKeyword
())){
throw
new
ExceptionFieldEmpty
(
"keyword"
);
}
logger
.
print
(
"{}搜索全局设计:{}
,关键字:{}"
,
effectivePerson
.
getDistinguishedName
(),
wi
.
getModuleList
(),
wi
.
getKeyword
()
);
logger
.
print
(
"{}搜索全局设计:{}
"
,
effectivePerson
.
getDistinguishedName
(),
wi
);
result
.
setData
(
search
(
wi
));
return
result
;
}
...
...
@@ -67,17 +65,17 @@ class ActionSearch extends BaseAction {
CompletableFuture
<
List
<
WrapDesigner
>>
cmsCf
=
searchAsync
(
wi
,
moduleMap
,
ModuleType
.
cms
.
toString
(),
x_cms_assemble_control
.
class
,
executor
);
Wo
wo
=
new
Wo
();
try
{
wo
.
setProcessPlatform
Designers
(
processPlatformCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
wo
.
setProcessPlatform
List
(
processPlatformCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
}
catch
(
Exception
e
)
{
logger
.
warn
(
"搜索流程平台设计异常:{}"
,
e
.
getMessage
());
}
try
{
wo
.
setPortal
Designers
(
portalCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
wo
.
setPortal
List
(
portalCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
}
catch
(
Exception
e
)
{
logger
.
warn
(
"搜索门户平台设计异常:{}"
,
e
.
getMessage
());
}
try
{
wo
.
setCms
Designers
(
cmsCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
wo
.
setCms
List
(
cmsCf
.
get
(
200
,
TimeUnit
.
SECONDS
));
}
catch
(
Exception
e
)
{
logger
.
warn
(
"搜索内容管理平台设计异常:{}"
,
e
.
getMessage
());
}
...
...
@@ -94,7 +92,7 @@ class ActionSearch extends BaseAction {
wiDesigner
.
setAppIdList
(
moduleMap
.
get
(
moduleType
));
List
<
WrapDesigner
>
designerList
=
ThisApplication
.
context
().
applications
().
postQuery
(
applicationClass
,
Applications
.
joinQueryUri
(
"designer"
,
"search"
),
wiDesigner
).
getDataAsList
(
WrapDesigner
.
class
);
logger
.
print
(
"设计搜索关联{}的匹配设计个数:{}"
,
moduleType
,
designerList
.
size
());
logger
.
info
(
"设计搜索关联{}的匹配设计个数:{}"
,
moduleType
,
designerList
.
size
());
getSearchRes
(
wi
,
designerList
);
swList
=
designerList
;
}
catch
(
Exception
e
)
{
...
...
@@ -219,34 +217,34 @@ class ActionSearch extends BaseAction {
private
static
final
long
serialVersionUID
=
8169092162410529422L
;
private
List
<
WrapDesigner
>
processPlatform
Designers
;
private
List
<
WrapDesigner
>
processPlatform
List
;
private
List
<
WrapDesigner
>
cms
Designers
;
private
List
<
WrapDesigner
>
cms
List
;
private
List
<
WrapDesigner
>
portal
Designers
;
private
List
<
WrapDesigner
>
portal
List
;
public
List
<
WrapDesigner
>
getProcessPlatform
Designers
()
{
return
processPlatform
Designers
;
public
List
<
WrapDesigner
>
getProcessPlatform
List
()
{
return
processPlatform
List
;
}
public
void
setProcessPlatform
Designers
(
List
<
WrapDesigner
>
processPlatformDesigners
)
{
this
.
processPlatform
Designers
=
processPlatformDesigners
;
public
void
setProcessPlatform
List
(
List
<
WrapDesigner
>
processPlatformList
)
{
this
.
processPlatform
List
=
processPlatformList
;
}
public
List
<
WrapDesigner
>
getCms
Designers
()
{
return
cms
Designers
;
public
List
<
WrapDesigner
>
getCms
List
()
{
return
cms
List
;
}
public
void
setCms
Designers
(
List
<
WrapDesigner
>
cmsDesigners
)
{
this
.
cms
Designers
=
cmsDesigners
;
public
void
setCms
List
(
List
<
WrapDesigner
>
cmsList
)
{
this
.
cms
List
=
cmsList
;
}
public
List
<
WrapDesigner
>
getPortal
Designers
()
{
return
portal
Designers
;
public
List
<
WrapDesigner
>
getPortal
List
()
{
return
portal
List
;
}
public
void
setPortal
Designers
(
List
<
WrapDesigner
>
portalDesigners
)
{
this
.
portal
Designers
=
portalDesigners
;
public
void
setPortal
List
(
List
<
WrapDesigner
>
portalList
)
{
this
.
portal
List
=
portalList
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录