Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
7693557b
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,发现更多精彩内容 >>
提交
7693557b
编写于
12月 09, 2020
作者:
O
o2null
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复更新脚本无法及时更新etag的bug
上级
831d47f5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
36 deletion
+43
-36
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/BaseAction.java
...ocessplatform/assemble/surface/jaxrs/form/BaseAction.java
+0
-5
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
...emble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
+22
-16
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
...surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
+21
-15
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/BaseAction.java
浏览文件 @
7693557b
...
@@ -5,11 +5,7 @@ import java.util.HashMap;
...
@@ -5,11 +5,7 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Map.Entry
;
import
java.util.TreeMap
;
import
java.util.concurrent.CompletableFuture
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.project.cache.Cache.CacheCategory
;
import
com.x.base.core.project.cache.Cache.CacheCategory
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.base.core.project.jaxrs.WoMaxAgeFastETag
;
import
com.x.base.core.project.jaxrs.WoMaxAgeFastETag
;
...
@@ -20,7 +16,6 @@ import com.x.processplatform.core.entity.content.WorkCompletedProperties;
...
@@ -20,7 +16,6 @@ import com.x.processplatform.core.entity.content.WorkCompletedProperties;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedForm
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedForm
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedScript
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedScript
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.FormProperties
;
import
com.x.processplatform.core.entity.element.Script
;
import
com.x.processplatform.core.entity.element.Script
;
abstract
class
BaseAction
extends
StandardJaxrsAction
{
abstract
class
BaseAction
extends
StandardJaxrsAction
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
浏览文件 @
7693557b
...
@@ -48,19 +48,26 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
...
@@ -48,19 +48,26 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
this
.
wo
=
(
Wo
)
optional
.
get
();
this
.
wo
=
(
Wo
)
optional
.
get
();
}
else
{
}
else
{
List
<
String
>
list
=
new
ArrayList
<>();
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
.
relatedFormFuture
(
this
.
form
.
getProperties
());
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
this
.
form
=
emc
.
find
(
form
.
getId
(),
Form
.
class
);
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
}
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
if
(
null
!=
this
.
form
)
{
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
List
<
String
>
list
=
new
ArrayList
<>();
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
.
relatedFormFuture
(
this
.
form
.
getProperties
());
this
.
wo
.
setId
(
this
.
form
.
getId
());
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
CRC32
crc
=
new
CRC32
();
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
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
);
...
@@ -99,10 +106,9 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
...
@@ -99,10 +106,9 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
List
<
String
>
list
=
new
ArrayList
<>();
List
<
String
>
list
=
new
ArrayList
<>();
if
(
ListTools
.
isNotEmpty
(
properties
.
getRelatedFormList
()))
{
if
(
ListTools
.
isNotEmpty
(
properties
.
getRelatedFormList
()))
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
Form
f
;
Form
f
;
for
(
String
id
:
properties
.
getRelatedFormList
())
{
for
(
String
id
:
properties
.
getRelatedFormList
())
{
f
=
business
.
form
().
pick
(
id
);
f
=
emc
.
find
(
id
,
Form
.
class
);
if
(
null
!=
f
)
{
if
(
null
!=
f
)
{
list
.
add
(
f
.
getId
()
+
f
.
getUpdateTime
().
getTime
());
list
.
add
(
f
.
getId
()
+
f
.
getUpdateTime
().
getTime
());
}
}
...
@@ -121,7 +127,7 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
...
@@ -121,7 +127,7 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
if
((
null
!=
properties
.
getRelatedScriptMap
())
&&
(
properties
.
getRelatedScriptMap
().
size
()
>
0
))
{
if
((
null
!=
properties
.
getRelatedScriptMap
())
&&
(
properties
.
getRelatedScriptMap
().
size
()
>
0
))
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
Business
business
=
new
Business
(
emc
);
list
=
convertScriptToCacheTag
(
business
,
properties
.
get
Mobile
RelatedScriptMap
());
list
=
convertScriptToCacheTag
(
business
,
properties
.
getRelatedScriptMap
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
logger
.
error
(
e
);
}
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
浏览文件 @
7693557b
...
@@ -48,19 +48,26 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
...
@@ -48,19 +48,26 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
this
.
wo
=
(
Wo
)
optional
.
get
();
this
.
wo
=
(
Wo
)
optional
.
get
();
}
else
{
}
else
{
List
<
String
>
list
=
new
ArrayList
<>();
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
.
relatedFormFuture
(
this
.
form
.
getProperties
());
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
this
.
form
=
emc
.
find
(
form
.
getId
(),
Form
.
class
);
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
}
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
if
(
null
!=
this
.
form
)
{
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
List
<
String
>
list
=
new
ArrayList
<>();
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CompletableFuture
<
List
<
String
>>
relatedFormFuture
=
this
list
=
list
.
stream
().
sorted
().
collect
(
Collectors
.
toList
());
.
relatedFormFuture
(
this
.
form
.
getProperties
());
this
.
wo
.
setId
(
this
.
form
.
getId
());
CompletableFuture
<
List
<
String
>>
relatedScriptFuture
=
this
CRC32
crc
=
new
CRC32
();
.
relatedScriptFuture
(
this
.
form
.
getProperties
());
crc
.
update
(
StringUtils
.
join
(
list
,
"#"
).
getBytes
());
list
.
add
(
this
.
form
.
getId
()
+
this
.
form
.
getUpdateTime
().
getTime
());
this
.
wo
.
setCacheTag
(
crc
.
getValue
()
+
""
);
list
.
addAll
(
relatedFormFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
wo
);
list
.
addAll
(
relatedScriptFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
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
);
...
@@ -99,10 +106,9 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
...
@@ -99,10 +106,9 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
List
<
String
>
list
=
new
ArrayList
<>();
List
<
String
>
list
=
new
ArrayList
<>();
if
(
ListTools
.
isNotEmpty
(
properties
.
getMobileRelatedFormList
()))
{
if
(
ListTools
.
isNotEmpty
(
properties
.
getMobileRelatedFormList
()))
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
Form
f
;
Form
f
;
for
(
String
id
:
properties
.
getMobileRelatedFormList
())
{
for
(
String
id
:
properties
.
getMobileRelatedFormList
())
{
f
=
business
.
form
().
pick
(
id
);
f
=
emc
.
find
(
id
,
Form
.
class
);
if
(
null
!=
f
)
{
if
(
null
!=
f
)
{
list
.
add
(
f
.
getId
()
+
f
.
getUpdateTime
().
getTime
());
list
.
add
(
f
.
getId
()
+
f
.
getUpdateTime
().
getTime
());
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录