提交 afaad21a 编写于 作者: Z zhourui

add name alias

上级 76e966e3
...@@ -28,7 +28,7 @@ public class AgentProcessor extends AbstractAgentProcessor { ...@@ -28,7 +28,7 @@ public class AgentProcessor extends AbstractAgentProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Agent agent) throws Exception { protected Work arriving(AeiObjects aeiObjects, Agent agent) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.agentArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.agentArrive(aeiObjects.getWork().getActivityToken(), agent));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -39,7 +39,7 @@ public class AgentProcessor extends AbstractAgentProcessor { ...@@ -39,7 +39,7 @@ public class AgentProcessor extends AbstractAgentProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Agent agent) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Agent agent) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.agentExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.agentExecute(aeiObjects.getWork().getActivityToken(), agent));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
if (StringUtils.isNotEmpty(agent.getScript()) || StringUtils.isNotEmpty(agent.getScriptText())) { if (StringUtils.isNotEmpty(agent.getScript()) || StringUtils.isNotEmpty(agent.getScriptText())) {
CompiledScript compiledScript = aeiObjects.business().element().getCompiledScript( CompiledScript compiledScript = aeiObjects.business().element().getCompiledScript(
...@@ -58,7 +58,7 @@ public class AgentProcessor extends AbstractAgentProcessor { ...@@ -58,7 +58,7 @@ public class AgentProcessor extends AbstractAgentProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Agent agent) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Agent agent) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.agentInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.agentInquire(aeiObjects.getWork().getActivityToken(), agent));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
Route o = aeiObjects.getRoutes().get(0); Route o = aeiObjects.getRoutes().get(0);
results.add(o); results.add(o);
......
...@@ -36,7 +36,7 @@ public class BeginProcessor extends AbstractBeginProcessor { ...@@ -36,7 +36,7 @@ public class BeginProcessor extends AbstractBeginProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Begin begin) throws Exception { protected Work arriving(AeiObjects aeiObjects, Begin begin) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.beginArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.beginArrive(aeiObjects.getWork().getActivityToken(), begin));
// 创建创建者的review // 创建创建者的review
String person = this.business().organization().person().get(aeiObjects.getWork().getCreatorPerson()); String person = this.business().organization().person().get(aeiObjects.getWork().getCreatorPerson());
if (StringUtils.isNotEmpty(person)) { if (StringUtils.isNotEmpty(person)) {
...@@ -53,7 +53,7 @@ public class BeginProcessor extends AbstractBeginProcessor { ...@@ -53,7 +53,7 @@ public class BeginProcessor extends AbstractBeginProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Begin begin) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Begin begin) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.beginExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.beginExecute(aeiObjects.getWork().getActivityToken(), begin));
List<Work> list = new ArrayList<>(); List<Work> list = new ArrayList<>();
// 如果是再次进入begin节点那么就不需要设置开始时间 // 如果是再次进入begin节点那么就不需要设置开始时间
if (aeiObjects.getWork().getStartTime() == null) { if (aeiObjects.getWork().getStartTime() == null) {
...@@ -78,7 +78,7 @@ public class BeginProcessor extends AbstractBeginProcessor { ...@@ -78,7 +78,7 @@ public class BeginProcessor extends AbstractBeginProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Begin begin) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Begin begin) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.beginInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.beginInquire(aeiObjects.getWork().getActivityToken(), begin));
List<Route> list = new ArrayList<>(); List<Route> list = new ArrayList<>();
Route o = aeiObjects.getRoutes().get(0); Route o = aeiObjects.getRoutes().get(0);
list.add(o); list.add(o);
......
...@@ -30,7 +30,7 @@ public class CancelProcessor extends AbstractCancelProcessor { ...@@ -30,7 +30,7 @@ public class CancelProcessor extends AbstractCancelProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Cancel cancel) throws Exception { protected Work arriving(AeiObjects aeiObjects, Cancel cancel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.cancelArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.cancelArrive(aeiObjects.getWork().getActivityToken(), cancel));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -42,7 +42,8 @@ public class CancelProcessor extends AbstractCancelProcessor { ...@@ -42,7 +42,8 @@ public class CancelProcessor extends AbstractCancelProcessor {
@Override @Override
public List<Work> executing(AeiObjects aeiObjects, Cancel cancel) throws Exception { public List<Work> executing(AeiObjects aeiObjects, Cancel cancel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.cancelExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.cancelExecute(aeiObjects.getWork().getActivityToken(), cancel));
// 唯一work处理 // 唯一work处理
if (aeiObjects.getWorks().size() > 1) { if (aeiObjects.getWorks().size() > 1) {
aeiObjects.getDeleteWorks().add(aeiObjects.getWork()); aeiObjects.getDeleteWorks().add(aeiObjects.getWork());
...@@ -84,7 +85,8 @@ public class CancelProcessor extends AbstractCancelProcessor { ...@@ -84,7 +85,8 @@ public class CancelProcessor extends AbstractCancelProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Cancel cancel) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Cancel cancel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.cancelInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.cancelInquire(aeiObjects.getWork().getActivityToken(), cancel));
return new ArrayList<>(); return new ArrayList<>();
} }
......
...@@ -31,19 +31,20 @@ public class ChoiceProcessor extends AbstractChoiceProcessor { ...@@ -31,19 +31,20 @@ public class ChoiceProcessor extends AbstractChoiceProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Choice choice) throws Exception { protected Work arriving(AeiObjects aeiObjects, Choice choice) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.choiceArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.choiceArrive(aeiObjects.getWork().getActivityToken(), choice));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
@Override @Override
protected void arrivingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception { protected void arrivingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception {
//nothing // nothing
} }
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Choice choice) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Choice choice) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.choiceExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.choiceExecute(aeiObjects.getWork().getActivityToken(), choice));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
results.add(aeiObjects.getWork()); results.add(aeiObjects.getWork());
return results; return results;
...@@ -51,13 +52,14 @@ public class ChoiceProcessor extends AbstractChoiceProcessor { ...@@ -51,13 +52,14 @@ public class ChoiceProcessor extends AbstractChoiceProcessor {
@Override @Override
protected void executingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception { protected void executingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception {
//nothing // nothing
} }
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Choice choice) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Choice choice) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.choiceInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.choiceInquire(aeiObjects.getWork().getActivityToken(), choice));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
// 多条路由进行判断 // 多条路由进行判断
for (Route o : aeiObjects.getRoutes()) { for (Route o : aeiObjects.getRoutes()) {
......
...@@ -32,7 +32,7 @@ public class DelayProcessor extends AbstractDelayProcessor { ...@@ -32,7 +32,7 @@ public class DelayProcessor extends AbstractDelayProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Delay delay) throws Exception { protected Work arriving(AeiObjects aeiObjects, Delay delay) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.delayArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.delayArrive(aeiObjects.getWork().getActivityToken(), delay));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -43,7 +43,7 @@ public class DelayProcessor extends AbstractDelayProcessor { ...@@ -43,7 +43,7 @@ public class DelayProcessor extends AbstractDelayProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Delay delay) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Delay delay) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.delayExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.delayExecute(aeiObjects.getWork().getActivityToken(), delay));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
Date limit = null; Date limit = null;
if (null != delay.getDelayMode() && Objects.equals(DelayMode.until, delay.getDelayMode())) { if (null != delay.getDelayMode() && Objects.equals(DelayMode.until, delay.getDelayMode())) {
...@@ -122,7 +122,7 @@ public class DelayProcessor extends AbstractDelayProcessor { ...@@ -122,7 +122,7 @@ public class DelayProcessor extends AbstractDelayProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Delay delay) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Delay delay) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.delayInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.delayInquire(aeiObjects.getWork().getActivityToken(), delay));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
...@@ -37,7 +37,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { ...@@ -37,7 +37,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Embed embed) throws Exception { protected Work arriving(AeiObjects aeiObjects, Embed embed) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.embedArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.embedArrive(aeiObjects.getWork().getActivityToken(), embed));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -48,7 +48,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { ...@@ -48,7 +48,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Embed embed) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Embed embed) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.embedExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.embedExecute(aeiObjects.getWork().getActivityToken(), embed));
AssginData assginData = new AssginData(); AssginData assginData = new AssginData();
String targetApplication = embed.getTargetApplication(); String targetApplication = embed.getTargetApplication();
String targetProcess = embed.getTargetProcess(); String targetProcess = embed.getTargetProcess();
...@@ -113,7 +113,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { ...@@ -113,7 +113,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Embed embed) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Embed embed) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.embedInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.embedInquire(aeiObjects.getWork().getActivityToken(), embed));
// 驱动上个环节新产生的work // 驱动上个环节新产生的work
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
......
...@@ -33,7 +33,7 @@ public class EndProcessor extends AbstractEndProcessor { ...@@ -33,7 +33,7 @@ public class EndProcessor extends AbstractEndProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, End end) throws Exception { protected Work arriving(AeiObjects aeiObjects, End end) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.endArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.endArrive(aeiObjects.getWork().getActivityToken(), end));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -45,7 +45,7 @@ public class EndProcessor extends AbstractEndProcessor { ...@@ -45,7 +45,7 @@ public class EndProcessor extends AbstractEndProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, End end) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, End end) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.endExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.endExecute(aeiObjects.getWork().getActivityToken(), end));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
Work other = aeiObjects.getWorks().stream().filter(o -> o != aeiObjects.getWork()) Work other = aeiObjects.getWorks().stream().filter(o -> o != aeiObjects.getWork())
...@@ -156,7 +156,7 @@ public class EndProcessor extends AbstractEndProcessor { ...@@ -156,7 +156,7 @@ public class EndProcessor extends AbstractEndProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, End end) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, End end) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.endInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.endInquire(aeiObjects.getWork().getActivityToken(), end));
return new ArrayList<>(); return new ArrayList<>();
} }
......
...@@ -43,14 +43,15 @@ public class InvokeProcessor extends AbstractInvokeProcessor { ...@@ -43,14 +43,15 @@ public class InvokeProcessor extends AbstractInvokeProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Invoke invoke) throws Exception { protected Work arriving(AeiObjects aeiObjects, Invoke invoke) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.invokeArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.invokeArrive(aeiObjects.getWork().getActivityToken(), invoke));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Invoke invoke) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Invoke invoke) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.invokeExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.invokeExecute(aeiObjects.getWork().getActivityToken(), invoke));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
switch (invoke.getInvokeMode()) { switch (invoke.getInvokeMode()) {
case jaxws: case jaxws:
...@@ -69,7 +70,8 @@ public class InvokeProcessor extends AbstractInvokeProcessor { ...@@ -69,7 +70,8 @@ public class InvokeProcessor extends AbstractInvokeProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Invoke invoke) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Invoke invoke) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.invokeInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.invokeInquire(aeiObjects.getWork().getActivityToken(), invoke));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
...@@ -60,7 +60,7 @@ public class ManualProcessor extends AbstractManualProcessor { ...@@ -60,7 +60,7 @@ public class ManualProcessor extends AbstractManualProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Manual manual) throws Exception { protected Work arriving(AeiObjects aeiObjects, Manual manual) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.manualArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.manualArrive(aeiObjects.getWork().getActivityToken(), manual));
// 根据manual计算出来的活动处理人 // 根据manual计算出来的活动处理人
List<String> identities = calculateTaskIdentities(aeiObjects, manual); List<String> identities = calculateTaskIdentities(aeiObjects, manual);
// 启用同类工作相同活动节点合并,如果有合并的工作,那么直接返回这个工作. // 启用同类工作相同活动节点合并,如果有合并的工作,那么直接返回这个工作.
...@@ -297,7 +297,7 @@ public class ManualProcessor extends AbstractManualProcessor { ...@@ -297,7 +297,7 @@ public class ManualProcessor extends AbstractManualProcessor {
} }
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.manualExecute(aeiObjects.getWork().getActivityToken(), aeiObjects.getProcessingAttributes().push(Signal.manualExecute(aeiObjects.getWork().getActivityToken(), manual,
Objects.toString(manual.getManualMode(), ""), identities)); Objects.toString(manual.getManualMode(), ""), identities));
switch (manual.getManualMode()) { switch (manual.getManualMode()) {
...@@ -331,7 +331,8 @@ public class ManualProcessor extends AbstractManualProcessor { ...@@ -331,7 +331,8 @@ public class ManualProcessor extends AbstractManualProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Manual manual) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Manual manual) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.manualInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.manualInquire(aeiObjects.getWork().getActivityToken(), manual));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
// 仅有单条路由 // 仅有单条路由
if (aeiObjects.getRoutes().size() == 1) { if (aeiObjects.getRoutes().size() == 1) {
......
...@@ -27,7 +27,7 @@ public class MergeProcessor extends AbstractMergeProcessor { ...@@ -27,7 +27,7 @@ public class MergeProcessor extends AbstractMergeProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Merge merge) throws Exception { protected Work arriving(AeiObjects aeiObjects, Merge merge) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.mergeArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.mergeArrive(aeiObjects.getWork().getActivityToken(), merge));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -38,7 +38,7 @@ public class MergeProcessor extends AbstractMergeProcessor { ...@@ -38,7 +38,7 @@ public class MergeProcessor extends AbstractMergeProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Merge merge) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Merge merge) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.mergeExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.mergeExecute(aeiObjects.getWork().getActivityToken(), merge));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
if (BooleanUtils.isNotTrue(aeiObjects.getWork().getSplitting())) { if (BooleanUtils.isNotTrue(aeiObjects.getWork().getSplitting())) {
/* 如果不是一个拆分文档,直接通过 */ /* 如果不是一个拆分文档,直接通过 */
...@@ -220,7 +220,7 @@ public class MergeProcessor extends AbstractMergeProcessor { ...@@ -220,7 +220,7 @@ public class MergeProcessor extends AbstractMergeProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Merge merge) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Merge merge) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.mergeInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.mergeInquire(aeiObjects.getWork().getActivityToken(), merge));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
...@@ -24,7 +24,8 @@ public class MessageProcessor extends AbstractMessageProcessor { ...@@ -24,7 +24,8 @@ public class MessageProcessor extends AbstractMessageProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Message message) throws Exception { protected Work arriving(AeiObjects aeiObjects, Message message) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.messageArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.messageArrive(aeiObjects.getWork().getActivityToken(), message));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -36,7 +37,8 @@ public class MessageProcessor extends AbstractMessageProcessor { ...@@ -36,7 +37,8 @@ public class MessageProcessor extends AbstractMessageProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Message message) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Message message) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.messageExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.messageExecute(aeiObjects.getWork().getActivityToken(), message));
MessageFactory.activity_message(aeiObjects.getWork(), null); MessageFactory.activity_message(aeiObjects.getWork(), null);
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
results.add(aeiObjects.getWork()); results.add(aeiObjects.getWork());
...@@ -51,7 +53,8 @@ public class MessageProcessor extends AbstractMessageProcessor { ...@@ -51,7 +53,8 @@ public class MessageProcessor extends AbstractMessageProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Message message) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Message message) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.messageInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.messageInquire(aeiObjects.getWork().getActivityToken(), message));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
...@@ -33,7 +33,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { ...@@ -33,7 +33,8 @@ public class ParallelProcessor extends AbstractParallelProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Parallel parallel) throws Exception { protected Work arriving(AeiObjects aeiObjects, Parallel parallel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.parallelArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.parallelArrive(aeiObjects.getWork().getActivityToken(), parallel));
logger.info( logger.info(
"parallel arrvie processing, work title:{}, id:{}, actvity name:{}, id:{}, activityToken:{}, process name:{}, id{}.", "parallel arrvie processing, work title:{}, id:{}, actvity name:{}, id:{}, activityToken:{}, process name:{}, id{}.",
aeiObjects.getWork().getTitle(), aeiObjects.getWork().getId(), parallel.getName(), parallel.getId(), aeiObjects.getWork().getTitle(), aeiObjects.getWork().getId(), parallel.getName(), parallel.getId(),
...@@ -50,7 +51,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { ...@@ -50,7 +51,8 @@ public class ParallelProcessor extends AbstractParallelProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Parallel parallel) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Parallel parallel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken(), parallel));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
aeiObjects.getWork().setSplitting(true); aeiObjects.getWork().setSplitting(true);
aeiObjects.getWork().setSplitToken(StringTools.uniqueToken()); aeiObjects.getWork().setSplitToken(StringTools.uniqueToken());
...@@ -110,7 +112,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { ...@@ -110,7 +112,8 @@ public class ParallelProcessor extends AbstractParallelProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Parallel parallel) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Parallel parallel) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken(), parallel));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
aeiObjects.getRoutes().stream().forEach(o -> { aeiObjects.getRoutes().stream().forEach(o -> {
if (StringUtils.equals(o.getId(), aeiObjects.getWork().getDestinationRoute())) { if (StringUtils.equals(o.getId(), aeiObjects.getWork().getDestinationRoute())) {
......
...@@ -31,7 +31,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { ...@@ -31,7 +31,8 @@ public class ServiceProcessor extends AbstractServiceProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Service service) throws Exception { protected Work arriving(AeiObjects aeiObjects, Service service) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.serviceArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.serviceArrive(aeiObjects.getWork().getActivityToken(), service));
// 清空上一次调用值 // 清空上一次调用值
aeiObjects.getWork().getProperties().setServiceValue(new LinkedHashMap<>()); aeiObjects.getWork().getProperties().setServiceValue(new LinkedHashMap<>());
return aeiObjects.getWork(); return aeiObjects.getWork();
...@@ -45,7 +46,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { ...@@ -45,7 +46,8 @@ public class ServiceProcessor extends AbstractServiceProcessor {
@Override @Override
protected List<Work> executing(AeiObjects aeiObjects, Service service) throws Exception { protected List<Work> executing(AeiObjects aeiObjects, Service service) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken(), service));
List<Work> results = new ArrayList<>(); List<Work> results = new ArrayList<>();
boolean passThrough = false; boolean passThrough = false;
if (StringUtils.isNotEmpty(service.getScript()) || StringUtils.isNotEmpty(service.getScriptText())) { if (StringUtils.isNotEmpty(service.getScript()) || StringUtils.isNotEmpty(service.getScriptText())) {
...@@ -73,7 +75,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { ...@@ -73,7 +75,8 @@ public class ServiceProcessor extends AbstractServiceProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Service service) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Service service) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes()
.push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken(), service));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
...@@ -32,7 +32,7 @@ public class SplitProcessor extends AbstractSplitProcessor { ...@@ -32,7 +32,7 @@ public class SplitProcessor extends AbstractSplitProcessor {
@Override @Override
protected Work arriving(AeiObjects aeiObjects, Split split) throws Exception { protected Work arriving(AeiObjects aeiObjects, Split split) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.splitArrive(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.splitArrive(aeiObjects.getWork().getActivityToken(), split));
return aeiObjects.getWork(); return aeiObjects.getWork();
} }
...@@ -55,7 +55,7 @@ public class SplitProcessor extends AbstractSplitProcessor { ...@@ -55,7 +55,7 @@ public class SplitProcessor extends AbstractSplitProcessor {
} }
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes() aeiObjects.getProcessingAttributes()
.push(Signal.splitExecute(aeiObjects.getWork().getActivityToken(), splitValues)); .push(Signal.splitExecute(aeiObjects.getWork().getActivityToken(), split, splitValues));
// 先将当前文档标志拆分值 // 先将当前文档标志拆分值
aeiObjects.getWork().setSplitValue(splitValues.get(0)); aeiObjects.getWork().setSplitValue(splitValues.get(0));
aeiObjects.getWork().getSplitValueList().add(splitValues.get(0)); aeiObjects.getWork().getSplitValueList().add(splitValues.get(0));
...@@ -100,7 +100,7 @@ public class SplitProcessor extends AbstractSplitProcessor { ...@@ -100,7 +100,7 @@ public class SplitProcessor extends AbstractSplitProcessor {
@Override @Override
protected List<Route> inquiring(AeiObjects aeiObjects, Split split) throws Exception { protected List<Route> inquiring(AeiObjects aeiObjects, Split split) throws Exception {
// 发送ProcessingSignal // 发送ProcessingSignal
aeiObjects.getProcessingAttributes().push(Signal.splitInquire(aeiObjects.getWork().getActivityToken())); aeiObjects.getProcessingAttributes().push(Signal.splitInquire(aeiObjects.getWork().getActivityToken(), split));
List<Route> results = new ArrayList<>(); List<Route> results = new ArrayList<>();
results.add(aeiObjects.getRoutes().get(0)); results.add(aeiObjects.getRoutes().get(0));
return results; return results;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册