Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
a041c453
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
a041c453
编写于
12月 09, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
退回getForm
上级
235099d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
40 deletion
+26
-40
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
...emble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
+13
-20
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
...surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
+13
-20
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
浏览文件 @
a041c453
...
@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
...
@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
this
.
wo
=
(
Wo
)
optional
.
get
();
this
.
wo
=
(
Wo
)
optional
.
get
();
}
else
{
}
else
{
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
List
<
String
>
list
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
.
relatedFormFuture
(
this
.
form
.
getProperties
());
this
.
form
=
emc
.
find
(
form
.
getId
(),
Form
.
class
);
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
}
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
if
(
null
!=
this
.
form
)
{
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
List
<
String
>
list
=
new
ArrayList
<>();
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
.
relatedFormFuture
(
this
.
form
.
getProperties
());
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
this
.
wo
.
setId
(
this
.
form
.
getId
());
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
CRC32
crc
=
new
CRC32
();
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
this
.
wo
.
setId
(
this
.
form
.
getId
());
CRC32
crc
=
new
CRC32
();
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
}
}
}
}
}
result
.
setData
(
wo
);
result
.
setData
(
wo
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
浏览文件 @
a041c453
...
@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
...
@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
this
.
wo
=
(
Wo
)
optional
.
get
();
this
.
wo
=
(
Wo
)
optional
.
get
();
}
else
{
}
else
{
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
List
<
String
>
list
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
.
relatedFormFuture
(
this
.
form
.
getProperties
());
this
.
form
=
emc
.
find
(
form
.
getId
(),
Form
.
class
);
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
}
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
if
(
null
!=
this
.
form
)
{
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
List
<
String
>
list
=
new
ArrayList
<>();
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
.
relatedFormFuture
(
this
.
form
.
getProperties
());
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
this
.
wo
.
setId
(
this
.
form
.
getId
());
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
CRC32
crc
=
new
CRC32
();
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
this
.
wo
.
setId
(
this
.
form
.
getId
());
CRC32
crc
=
new
CRC32
();
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
}
}
}
}
}
result
.
setData
(
wo
);
result
.
setData
(
wo
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录