Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
2e843fd0
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,体验更适合开发者的 AI 搜索 >>
提交
2e843fd0
编写于
6月 16, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修正retract没有发送消息
上级
7f7190e6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
15 deletion
+40
-15
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java
...cessplatform/service/processing/jaxrs/work/V2Retract.java
+40
-15
未找到文件。
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java
浏览文件 @
2e843fd0
...
...
@@ -30,6 +30,7 @@ import com.x.processplatform.core.entity.element.util.WorkLogTree.Node;
import
com.x.processplatform.core.entity.element.util.WorkLogTree.Nodes
;
import
com.x.processplatform.core.express.service.processing.jaxrs.work.V2RetractWi
;
import
com.x.processplatform.service.processing.Business
;
import
com.x.processplatform.service.processing.MessageFactory
;
import
org.apache.commons.collections4.ListUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -74,10 +75,12 @@ class V2Retract extends BaseAction {
emc
.
beginTransaction
(
Work
.
class
);
emc
.
beginTransaction
(
Record
.
class
);
deleteTasks
(
business
,
work
.
getJob
(),
activityTokens
);
deleteTaskCompleteds
(
business
,
work
.
getJob
(),
activityTokens
);
deleteReads
(
business
,
work
.
getJob
(),
activityTokens
);
deleteReadCompleteds
(
business
,
work
.
getJob
(),
activityTokens
);
List
<
Task
>
removeTasks
=
deleteTasks
(
business
,
work
.
getJob
(),
activityTokens
);
List
<
TaskCompleted
>
removeTaskCompleteds
=
deleteTaskCompleteds
(
business
,
work
.
getJob
(),
activityTokens
);
List
<
Read
>
removeReads
=
deleteReads
(
business
,
work
.
getJob
(),
activityTokens
);
List
<
ReadCompleted
>
removeReadCompleteds
=
deleteReadCompleteds
(
business
,
work
.
getJob
(),
activityTokens
);
deleteRecords
(
business
,
work
.
getJob
(),
activityTokens
);
deleteWorkLogs
(
business
,
work
.
getJob
(),
activityTokens
);
...
...
@@ -100,13 +103,13 @@ class V2Retract extends BaseAction {
update
(
work
,
workLog
);
if
(
null
!=
taskCompleted
)
{
taskCompleted
.
setProcessingType
(
TaskCompleted
.
PROCESSINGTYPE_RETRACT
);
List
<
String
>
manualTaskIdentityList
=
new
ArrayList
<>();
manualTaskIdentityList
.
add
(
taskCompleted
.
getIdentity
());
work
.
setManualTaskIdentityList
(
manualTaskIdentityList
);
}
// 必然不为null
taskCompleted
.
setProcessingType
(
TaskCompleted
.
PROCESSINGTYPE_RETRACT
);
List
<
String
>
manualTaskIdentityList
=
new
ArrayList
<>();
manualTaskIdentityList
.
add
(
taskCompleted
.
getIdentity
());
work
.
setManualTaskIdentityList
(
manualTaskIdentityList
);
// 发送消息
sendRemoveMessages
(
removeTasks
,
removeTaskCompleteds
,
removeReads
,
removeReadCompleteds
);
emc
.
commit
();
}
...
...
@@ -122,6 +125,22 @@ class V2Retract extends BaseAction {
}
private
void
sendRemoveMessages
(
List
<
Task
>
removeTasks
,
List
<
TaskCompleted
>
removeTaskCompleteds
,
List
<
Read
>
removeReads
,
List
<
ReadCompleted
>
removeReadCompleteds
)
throws
Exception
{
for
(
Task
o
:
removeTasks
)
{
MessageFactory
.
task_delete
(
o
);
}
for
(
TaskCompleted
o
:
removeTaskCompleteds
)
{
MessageFactory
.
taskCompleted_delete
(
o
);
}
for
(
Read
o
:
removeReads
)
{
MessageFactory
.
read_delete
(
o
);
}
for
(
ReadCompleted
o
:
removeReadCompleteds
)
{
MessageFactory
.
readCompleted_delete
(
o
);
}
}
private
TaskCompleted
getTaskCompleted
(
Business
business
,
String
taskCompletedId
)
throws
Exception
{
TaskCompleted
taskCompleted
=
business
.
entityManagerContainer
().
find
(
taskCompletedId
,
TaskCompleted
.
class
);
if
(
null
==
taskCompleted
)
{
...
...
@@ -181,36 +200,42 @@ class V2Retract extends BaseAction {
return
ListTools
.
trim
(
list
,
true
,
true
);
}
private
void
deleteTasks
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
private
List
<
Task
>
deleteTasks
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
List
<
Task
>
os
=
business
.
entityManagerContainer
().
listEqualAndIn
(
Task
.
class
,
Task
.
job_FIELDNAME
,
job
,
Task
.
activityToken_FIELDNAME
,
activityTokens
);
for
(
Task
o
:
os
)
{
business
.
entityManagerContainer
().
remove
(
o
,
CheckRemoveType
.
all
);
}
return
os
;
}
private
void
deleteTaskCompleteds
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
private
List
<
TaskCompleted
>
deleteTaskCompleteds
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
List
<
TaskCompleted
>
os
=
business
.
entityManagerContainer
().
listEqualAndIn
(
TaskCompleted
.
class
,
TaskCompleted
.
job_FIELDNAME
,
job
,
TaskCompleted
.
activityToken_FIELDNAME
,
activityTokens
);
for
(
TaskCompleted
o
:
os
)
{
business
.
entityManagerContainer
().
remove
(
o
,
CheckRemoveType
.
all
);
}
return
os
;
}
private
void
deleteReads
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
private
List
<
Read
>
deleteReads
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
List
<
Read
>
os
=
business
.
entityManagerContainer
().
listEqualAndIn
(
Read
.
class
,
Read
.
job_FIELDNAME
,
job
,
Read
.
activityToken_FIELDNAME
,
activityTokens
);
for
(
Read
o
:
os
)
{
business
.
entityManagerContainer
().
remove
(
o
,
CheckRemoveType
.
all
);
}
return
os
;
}
private
void
deleteReadCompleteds
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
private
List
<
ReadCompleted
>
deleteReadCompleteds
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
List
<
ReadCompleted
>
os
=
business
.
entityManagerContainer
().
listEqualAndIn
(
ReadCompleted
.
class
,
ReadCompleted
.
job_FIELDNAME
,
job
,
ReadCompleted
.
activityToken_FIELDNAME
,
activityTokens
);
for
(
ReadCompleted
o
:
os
)
{
business
.
entityManagerContainer
().
remove
(
o
,
CheckRemoveType
.
all
);
}
return
os
;
}
private
void
deleteRecords
(
Business
business
,
String
job
,
List
<
String
>
activityTokens
)
throws
Exception
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录