From afaad21a698e62696ddb0e2fbf764f456265c2ea Mon Sep 17 00:00:00 2001 From: zhourui Date: Tue, 8 Sep 2020 10:41:37 +0800 Subject: [PATCH] add name alias --- .../core/entity/log/Signal.java | 295 +++++++----------- .../processor/agent/AgentProcessor.java | 6 +- .../processor/begin/BeginProcessor.java | 6 +- .../processor/cancel/CancelProcessor.java | 8 +- .../processor/choice/ChoiceProcessor.java | 12 +- .../processor/delay/DelayProcessor.java | 6 +- .../processor/embed/EmbedProcessor.java | 6 +- .../processor/end/EndProcessor.java | 6 +- .../processor/invoke/InvokeProcessor.java | 8 +- .../processor/manual/ManualProcessor.java | 7 +- .../processor/merge/MergeProcessor.java | 6 +- .../processor/message/MessageProcessor.java | 9 +- .../processor/parallel/ParallelProcessor.java | 9 +- .../processor/service/ServiceProcessor.java | 9 +- .../processor/split/SplitProcessor.java | 6 +- 15 files changed, 170 insertions(+), 229 deletions(-) diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/Signal.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/Signal.java index 9e2e6ceb2a..652a5c2c82 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/Signal.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/Signal.java @@ -4,12 +4,24 @@ import java.util.Date; import java.util.List; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.element.Activity; public class Signal extends GsonPropertyObject { -// public static final String TYPE_AGENTARRIVE = "agentArrive"; -// public static final String TYPE_AGENTEXECUTE = "agentExecute"; -// public static final String TYPE_AGENTINQUIRE = "agentInquire"; + public Signal() { + this.time = new Date(); + this.stamp = this.time.getTime(); + } + + public Signal(String activityToken, Activity activity) { + this(); + this.activityToken = activityToken; + if (null != activity) { + this.alias = activity.getAlias(); + this.name = activity.getName(); + } + + } private AgentArrive agentArrive; private AgentExecute agentExecute; @@ -31,9 +43,8 @@ public class Signal extends GsonPropertyObject { } - public static Signal agentArrive(String activityToken) { - Signal p = new Signal(); - p.activityToken = activityToken; + public static Signal agentArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); AgentArrive s = new AgentArrive(); p.agentArrive = s; return p; @@ -43,11 +54,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal agentExecute(String activityToken) { - Signal p = new Signal(); + public static Signal agentExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); AgentExecute s = new AgentExecute(); p.agentExecute = s; - p.activityToken = activityToken; return p; } @@ -55,18 +65,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal agentInquire(String activityToken) { - Signal p = new Signal(); + public static Signal agentInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); AgentInquire s = new AgentInquire(); p.agentInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_BEGINARRIVE = "beginArrive"; -// public static final String TYPE_BEGINEXECUTE = "beginExecute"; -// public static final String TYPE_BEGININQUIRE = "beginInquire"; - private BeginArrive beginArrive; private BeginExecute beginExecute; private BeginInquire beginInquire; @@ -87,11 +92,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal beginArrive(String activityToken) { - Signal p = new Signal(); + public static Signal beginArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); BeginArrive s = new BeginArrive(); p.beginArrive = s; - p.activityToken = activityToken; return p; } @@ -99,11 +103,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal beginExecute(String activityToken) { - Signal p = new Signal(); + public static Signal beginExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); BeginExecute s = new BeginExecute(); p.beginExecute = s; - p.activityToken = activityToken; return p; } @@ -111,18 +114,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal beginInquire(String activityToken) { - Signal p = new Signal(); + public static Signal beginInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); BeginInquire s = new BeginInquire(); p.beginInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_CANCELARRIVE = "cancelArrive"; -// public static final String TYPE_CANCELEXECUTE = "cancelExecute"; -// public static final String TYPE_CANCELINQUIRE = "cancelInquire"; - private CancelArrive cancelArrive; private CancelExecute cancelExecute; private CancelInquire cancelInquire; @@ -143,11 +141,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal cancelArrive(String activityToken) { - Signal p = new Signal(); + public static Signal cancelArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); CancelArrive s = new CancelArrive(); p.cancelArrive = s; - p.activityToken = activityToken; return p; } @@ -155,11 +152,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal cancelExecute(String activityToken) { - Signal p = new Signal(); + public static Signal cancelExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); CancelExecute s = new CancelExecute(); p.cancelExecute = s; - p.activityToken = activityToken; return p; } @@ -167,18 +163,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal cancelInquire(String activityToken) { - Signal p = new Signal(); + public static Signal cancelInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); CancelInquire s = new CancelInquire(); p.cancelInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_CHOICEARRIVE = "choiceArrive"; -// public static final String TYPE_CHOICEEXECUTE = "choiceExecute"; -// public static final String TYPE_CHOICEINQUIRE = "choiceInquire"; - private ChoiceArrive choiceArrive; private ChoiceExecute choiceExecute; private ChoiceInquire choiceInquire; @@ -199,11 +190,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal choiceArrive(String activityToken) { - Signal p = new Signal(); + public static Signal choiceArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ChoiceArrive s = new ChoiceArrive(); p.choiceArrive = s; - p.activityToken = activityToken; return p; } @@ -211,11 +201,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal choiceExecute(String activityToken) { - Signal p = new Signal(); + public static Signal choiceExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ChoiceExecute s = new ChoiceExecute(); p.choiceExecute = s; - p.activityToken = activityToken; return p; } @@ -223,18 +212,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal choiceInquire(String activityToken) { - Signal p = new Signal(); + public static Signal choiceInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ChoiceInquire s = new ChoiceInquire(); p.choiceInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_DELAYARRIVE = "delayArrive"; -// public static final String TYPE_DELAYEXECUTE = "delayExecute"; -// public static final String TYPE_DELAYINQUIRE = "delayInquire"; - private DelayArrive delayArrive; private DelayExecute delayExecute; private DelayInquire delayInquire; @@ -255,11 +239,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal delayArrive(String activityToken) { - Signal p = new Signal(); + public static Signal delayArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); DelayArrive s = new DelayArrive(); p.delayArrive = s; - p.activityToken = activityToken; return p; } @@ -267,11 +250,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal delayExecute(String activityToken) { - Signal p = new Signal(); + public static Signal delayExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); DelayExecute s = new DelayExecute(); p.delayExecute = s; - p.activityToken = activityToken; return p; } @@ -279,18 +261,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal delayInquire(String activityToken) { - Signal p = new Signal(); + public static Signal delayInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); DelayInquire s = new DelayInquire(); p.delayInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_EMBEDARRIVE = "embedArrive"; -// public static final String TYPE_EMBEDEXECUTE = "embedExecute"; -// public static final String TYPE_EMBEDINQUIRE = "embedInquire"; - private EmbedArrive embedArrive; private EmbedExecute embedExecute; private EmbedInquire embedInquire; @@ -311,11 +288,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal embedArrive(String activityToken) { - Signal p = new Signal(); + public static Signal embedArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EmbedArrive s = new EmbedArrive(); p.embedArrive = s; - p.activityToken = activityToken; return p; } @@ -323,11 +299,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal embedExecute(String activityToken) { - Signal p = new Signal(); + public static Signal embedExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EmbedExecute s = new EmbedExecute(); p.embedExecute = s; - p.activityToken = activityToken; return p; } @@ -335,18 +310,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal embedInquire(String activityToken) { - Signal p = new Signal(); + public static Signal embedInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EmbedInquire s = new EmbedInquire(); p.embedInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_ENDARRIVE = "endArrive"; -// public static final String TYPE_ENDEXECUTE = "endExecute"; -// public static final String TYPE_ENDINQUIRE = "endInquire"; - private EndArrive endArrive; private EndExecute endExecute; private EndInquire endInquire; @@ -367,11 +337,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal endArrive(String activityToken) { - Signal p = new Signal(); + public static Signal endArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EndArrive s = new EndArrive(); p.endArrive = s; - p.activityToken = activityToken; return p; } @@ -379,11 +348,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal endExecute(String activityToken) { - Signal p = new Signal(); + public static Signal endExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EndExecute s = new EndExecute(); p.endExecute = s; - p.activityToken = activityToken; return p; } @@ -391,18 +359,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal endInquire(String activityToken) { - Signal p = new Signal(); + public static Signal endInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); EndInquire s = new EndInquire(); p.endInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_INVOKEARRIVE = "invokeArrive"; -// public static final String TYPE_INVOKEEXECUTE = "invokeExecute"; -// public static final String TYPE_INVOKEINQUIRE = "invokeInquire"; - private InvokeArrive invokeArrive; private InvokeExecute invokeExecute; private InvokeInquire invokeInquire; @@ -423,11 +386,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal invokeArrive(String activityToken) { - Signal p = new Signal(); + public static Signal invokeArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); InvokeArrive s = new InvokeArrive(); p.invokeArrive = s; - p.activityToken = activityToken; return p; } @@ -435,11 +397,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal invokeExecute(String activityToken) { - Signal p = new Signal(); + public static Signal invokeExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); InvokeExecute s = new InvokeExecute(); p.invokeExecute = s; - p.activityToken = activityToken; return p; } @@ -447,18 +408,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal invokeInquire(String activityToken) { - Signal p = new Signal(); + public static Signal invokeInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); InvokeInquire s = new InvokeInquire(); p.invokeInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_MANUALARRIVE = "manualArrive"; -// public static final String TYPE_MANUALEXECUTE = "manualExecute"; -// public static final String TYPE_MANUALINQUIRE = "manualInquire"; - private ManualArrive manualArrive; private ManualExecute manualExecute; private ManualInquire manualInquire; @@ -479,11 +435,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal manualArrive(String activityToken) { - Signal p = new Signal(); + public static Signal manualArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ManualArrive s = new ManualArrive(); p.manualArrive = s; - p.activityToken = activityToken; return p; } @@ -502,13 +457,12 @@ public class Signal extends GsonPropertyObject { } - public static Signal manualExecute(String activityToken, String type, List identities) { - Signal p = new Signal(); + public static Signal manualExecute(String activityToken, Activity activity, String type, List identities) { + Signal p = new Signal(activityToken, activity); ManualExecute s = new ManualExecute(); s.type = type; s.identities = identities; p.manualExecute = s; - p.activityToken = activityToken; return p; } @@ -516,18 +470,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal manualInquire(String activityToken) { - Signal p = new Signal(); + public static Signal manualInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ManualInquire s = new ManualInquire(); p.manualInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_MERGEARRIVE = "mergeArrive"; -// public static final String TYPE_MERGEEXECUTE = "mergeExecute"; -// public static final String TYPE_MERGEINQUIRE = "mergeInquire"; - private MergeArrive mergeArrive; private MergeExecute mergeExecute; private MergeInquire mergeInquire; @@ -548,11 +497,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal mergeArrive(String activityToken) { - Signal p = new Signal(); + public static Signal mergeArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MergeArrive s = new MergeArrive(); p.mergeArrive = s; - p.activityToken = activityToken; return p; } @@ -560,11 +508,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal mergeExecute(String activityToken) { - Signal p = new Signal(); + public static Signal mergeExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MergeExecute s = new MergeExecute(); p.mergeExecute = s; - p.activityToken = activityToken; return p; } @@ -572,18 +519,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal mergeInquire(String activityToken) { - Signal p = new Signal(); + public static Signal mergeInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MergeInquire s = new MergeInquire(); p.mergeInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_MESSAGEARRIVE = "messageArrive"; -// public static final String TYPE_MESSAGEEXECUTE = "messageExecute"; -// public static final String TYPE_MESSAGEINQUIRE = "messageInquire"; - private MessageArrive messageArrive; private MessageExecute messageExecute; private MessageInquire messageInquire; @@ -604,11 +546,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal messageArrive(String activityToken) { - Signal p = new Signal(); + public static Signal messageArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MessageArrive s = new MessageArrive(); p.messageArrive = s; - p.activityToken = activityToken; return p; } @@ -616,11 +557,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal messageExecute(String activityToken) { - Signal p = new Signal(); + public static Signal messageExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MessageExecute s = new MessageExecute(); p.messageExecute = s; - p.activityToken = activityToken; return p; } @@ -628,18 +568,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal messageInquire(String activityToken) { - Signal p = new Signal(); + public static Signal messageInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); MessageInquire s = new MessageInquire(); p.messageInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_PARALLELARRIVE = "parallelArrive"; -// public static final String TYPE_PARALLELEXECUTE = "parallelExecute"; -// public static final String TYPE_PARALLELINQUIRE = "parallelInquire"; - private ParallelArrive parallelArrive; private ParallelExecute parallelExecute; private ParallelInquire parallelInquire; @@ -660,11 +595,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal parallelArrive(String activityToken) { - Signal p = new Signal(); + public static Signal parallelArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ParallelArrive s = new ParallelArrive(); p.parallelArrive = s; - p.activityToken = activityToken; return p; } @@ -672,11 +606,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal parallelExecute(String activityToken) { - Signal p = new Signal(); + public static Signal parallelExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ParallelExecute s = new ParallelExecute(); p.parallelExecute = s; - p.activityToken = activityToken; return p; } @@ -684,18 +617,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal parallelInquire(String activityToken) { - Signal p = new Signal(); + public static Signal parallelInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ParallelInquire s = new ParallelInquire(); p.parallelInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_SERVICEARRIVE = "serviceArrive"; -// public static final String TYPE_SERVICEEXECUTE = "serviceExecute"; -// public static final String TYPE_SERVICEINQUIRE = "serviceInquire"; - private ServiceArrive serviceArrive; private ServiceExecute serviceExecute; private ServiceInquire serviceInquire; @@ -716,11 +644,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal serviceArrive(String activityToken) { - Signal p = new Signal(); + public static Signal serviceArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ServiceArrive s = new ServiceArrive(); p.serviceArrive = s; - p.activityToken = activityToken; return p; } @@ -728,11 +655,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal serviceExecute(String activityToken) { - Signal p = new Signal(); + public static Signal serviceExecute(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ServiceExecute s = new ServiceExecute(); p.serviceExecute = s; - p.activityToken = activityToken; return p; } @@ -740,18 +666,13 @@ public class Signal extends GsonPropertyObject { } - public static Signal serviceInquire(String activityToken) { - Signal p = new Signal(); + public static Signal serviceInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); ServiceInquire s = new ServiceInquire(); p.serviceInquire = s; - p.activityToken = activityToken; return p; } -// public static final String TYPE_SPLITARRIVE = "splitArrive"; -// public static final String TYPE_SPLITEXECUTE = "splitExecute"; -// public static final String TYPE_SPLITINQUIRE = "splitInquire"; - private SplitArrive splitArrive; private SplitExecute splitExecute; private SplitInquire splitInquire; @@ -772,11 +693,10 @@ public class Signal extends GsonPropertyObject { } - public static Signal splitArrive(String activityToken) { - Signal p = new Signal(); + public static Signal splitArrive(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); SplitArrive s = new SplitArrive(); p.splitArrive = s; - p.activityToken = activityToken; return p; } @@ -790,12 +710,11 @@ public class Signal extends GsonPropertyObject { } - public static Signal splitExecute(String activityToken, List splitValues) { - Signal p = new Signal(); + public static Signal splitExecute(String activityToken, Activity activity, List splitValues) { + Signal p = new Signal(activityToken, activity); SplitExecute s = new SplitExecute(); s.splitValueList = splitValues; p.splitExecute = s; - p.activityToken = activityToken; return p; } @@ -803,18 +722,16 @@ public class Signal extends GsonPropertyObject { } - public static Signal splitInquire(String activityToken) { - Signal p = new Signal(); + public static Signal splitInquire(String activityToken, Activity activity) { + Signal p = new Signal(activityToken, activity); SplitInquire s = new SplitInquire(); p.splitInquire = s; - p.activityToken = activityToken; return p; } - public Signal() { - this.time = new Date(); - this.stamp = this.time.getTime(); - } + private String name; + + private String alias; private String activityToken; @@ -822,6 +739,14 @@ public class Signal extends GsonPropertyObject { return activityToken; } + public String getName() { + return name; + } + + public String getAlias() { + return alias; + } + private Long stamp; public Long getStamp() { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AgentProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AgentProcessor.java index 1fda3cdb7d..5306ee96e2 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AgentProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AgentProcessor.java @@ -28,7 +28,7 @@ public class AgentProcessor extends AbstractAgentProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Agent agent) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.agentArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.agentArrive(aeiObjects.getWork().getActivityToken(), agent)); return aeiObjects.getWork(); } @@ -39,7 +39,7 @@ public class AgentProcessor extends AbstractAgentProcessor { @Override protected List executing(AeiObjects aeiObjects, Agent agent) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.agentExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.agentExecute(aeiObjects.getWork().getActivityToken(), agent)); List results = new ArrayList<>(); if (StringUtils.isNotEmpty(agent.getScript()) || StringUtils.isNotEmpty(agent.getScriptText())) { CompiledScript compiledScript = aeiObjects.business().element().getCompiledScript( @@ -58,7 +58,7 @@ public class AgentProcessor extends AbstractAgentProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Agent agent) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.agentInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.agentInquire(aeiObjects.getWork().getActivityToken(), agent)); List results = new ArrayList<>(); Route o = aeiObjects.getRoutes().get(0); results.add(o); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/BeginProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/BeginProcessor.java index 871aadbfa7..7bdb6644ce 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/BeginProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/BeginProcessor.java @@ -36,7 +36,7 @@ public class BeginProcessor extends AbstractBeginProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Begin begin) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.beginArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.beginArrive(aeiObjects.getWork().getActivityToken(), begin)); // 创建创建者的review String person = this.business().organization().person().get(aeiObjects.getWork().getCreatorPerson()); if (StringUtils.isNotEmpty(person)) { @@ -53,7 +53,7 @@ public class BeginProcessor extends AbstractBeginProcessor { @Override protected List executing(AeiObjects aeiObjects, Begin begin) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.beginExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.beginExecute(aeiObjects.getWork().getActivityToken(), begin)); List list = new ArrayList<>(); // 如果是再次进入begin节点那么就不需要设置开始时间 if (aeiObjects.getWork().getStartTime() == null) { @@ -78,7 +78,7 @@ public class BeginProcessor extends AbstractBeginProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Begin begin) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.beginInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.beginInquire(aeiObjects.getWork().getActivityToken(), begin)); List list = new ArrayList<>(); Route o = aeiObjects.getRoutes().get(0); list.add(o); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/CancelProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/CancelProcessor.java index 57ae7964fa..f7839fb804 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/CancelProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/CancelProcessor.java @@ -30,7 +30,7 @@ public class CancelProcessor extends AbstractCancelProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Cancel cancel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.cancelArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.cancelArrive(aeiObjects.getWork().getActivityToken(), cancel)); return aeiObjects.getWork(); } @@ -42,7 +42,8 @@ public class CancelProcessor extends AbstractCancelProcessor { @Override public List executing(AeiObjects aeiObjects, Cancel cancel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.cancelExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.cancelExecute(aeiObjects.getWork().getActivityToken(), cancel)); // 唯一work处理 if (aeiObjects.getWorks().size() > 1) { aeiObjects.getDeleteWorks().add(aeiObjects.getWork()); @@ -84,7 +85,8 @@ public class CancelProcessor extends AbstractCancelProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Cancel cancel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.cancelInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.cancelInquire(aeiObjects.getWork().getActivityToken(), cancel)); return new ArrayList<>(); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/ChoiceProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/ChoiceProcessor.java index 3843ec7c2c..7b94738c4b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/ChoiceProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/ChoiceProcessor.java @@ -31,19 +31,20 @@ public class ChoiceProcessor extends AbstractChoiceProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Choice choice) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.choiceArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.choiceArrive(aeiObjects.getWork().getActivityToken(), choice)); return aeiObjects.getWork(); } @Override protected void arrivingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception { - //nothing + // nothing } @Override protected List executing(AeiObjects aeiObjects, Choice choice) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.choiceExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.choiceExecute(aeiObjects.getWork().getActivityToken(), choice)); List results = new ArrayList<>(); results.add(aeiObjects.getWork()); return results; @@ -51,13 +52,14 @@ public class ChoiceProcessor extends AbstractChoiceProcessor { @Override protected void executingCommitted(AeiObjects aeiObjects, Choice choice) throws Exception { - //nothing + // nothing } @Override protected List inquiring(AeiObjects aeiObjects, Choice choice) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.choiceInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.choiceInquire(aeiObjects.getWork().getActivityToken(), choice)); List results = new ArrayList<>(); // 多条路由进行判断 for (Route o : aeiObjects.getRoutes()) { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/DelayProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/DelayProcessor.java index ba0c5feeb6..ed618aa12b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/DelayProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/DelayProcessor.java @@ -32,7 +32,7 @@ public class DelayProcessor extends AbstractDelayProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Delay delay) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.delayArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.delayArrive(aeiObjects.getWork().getActivityToken(), delay)); return aeiObjects.getWork(); } @@ -43,7 +43,7 @@ public class DelayProcessor extends AbstractDelayProcessor { @Override protected List executing(AeiObjects aeiObjects, Delay delay) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.delayExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.delayExecute(aeiObjects.getWork().getActivityToken(), delay)); List results = new ArrayList<>(); Date limit = null; if (null != delay.getDelayMode() && Objects.equals(DelayMode.until, delay.getDelayMode())) { @@ -122,7 +122,7 @@ public class DelayProcessor extends AbstractDelayProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Delay delay) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.delayInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.delayInquire(aeiObjects.getWork().getActivityToken(), delay)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java index 60e3d56ce7..4c3c921f8b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java @@ -37,7 +37,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Embed embed) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.embedArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.embedArrive(aeiObjects.getWork().getActivityToken(), embed)); return aeiObjects.getWork(); } @@ -48,7 +48,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { @Override protected List executing(AeiObjects aeiObjects, Embed embed) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.embedExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.embedExecute(aeiObjects.getWork().getActivityToken(), embed)); AssginData assginData = new AssginData(); String targetApplication = embed.getTargetApplication(); String targetProcess = embed.getTargetProcess(); @@ -113,7 +113,7 @@ public class EmbedProcessor extends AbstractEmbedProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Embed embed) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.embedInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.embedInquire(aeiObjects.getWork().getActivityToken(), embed)); // 驱动上个环节新产生的work List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java index f8436a4c9e..e667c0f0d7 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java @@ -33,7 +33,7 @@ public class EndProcessor extends AbstractEndProcessor { @Override protected Work arriving(AeiObjects aeiObjects, End end) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.endArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.endArrive(aeiObjects.getWork().getActivityToken(), end)); return aeiObjects.getWork(); } @@ -45,7 +45,7 @@ public class EndProcessor extends AbstractEndProcessor { @Override protected List executing(AeiObjects aeiObjects, End end) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.endExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.endExecute(aeiObjects.getWork().getActivityToken(), end)); List results = new ArrayList<>(); Work other = aeiObjects.getWorks().stream().filter(o -> o != aeiObjects.getWork()) @@ -156,7 +156,7 @@ public class EndProcessor extends AbstractEndProcessor { @Override protected List inquiring(AeiObjects aeiObjects, End end) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.endInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.endInquire(aeiObjects.getWork().getActivityToken(), end)); return new ArrayList<>(); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/InvokeProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/InvokeProcessor.java index c14007badc..ed6b88a64c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/InvokeProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/InvokeProcessor.java @@ -43,14 +43,15 @@ public class InvokeProcessor extends AbstractInvokeProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Invoke invoke) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.invokeArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.invokeArrive(aeiObjects.getWork().getActivityToken(), invoke)); return aeiObjects.getWork(); } @Override protected List executing(AeiObjects aeiObjects, Invoke invoke) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.invokeExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.invokeExecute(aeiObjects.getWork().getActivityToken(), invoke)); List results = new ArrayList<>(); switch (invoke.getInvokeMode()) { case jaxws: @@ -69,7 +70,8 @@ public class InvokeProcessor extends AbstractInvokeProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Invoke invoke) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.invokeInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.invokeInquire(aeiObjects.getWork().getActivityToken(), invoke)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java index 0665cdb5cd..d49fbe3e59 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java @@ -60,7 +60,7 @@ public class ManualProcessor extends AbstractManualProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Manual manual) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.manualArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.manualArrive(aeiObjects.getWork().getActivityToken(), manual)); // 根据manual计算出来的活动处理人 List identities = calculateTaskIdentities(aeiObjects, manual); // 启用同类工作相同活动节点合并,如果有合并的工作,那么直接返回这个工作. @@ -297,7 +297,7 @@ public class ManualProcessor extends AbstractManualProcessor { } // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.manualExecute(aeiObjects.getWork().getActivityToken(), + aeiObjects.getProcessingAttributes().push(Signal.manualExecute(aeiObjects.getWork().getActivityToken(), manual, Objects.toString(manual.getManualMode(), ""), identities)); switch (manual.getManualMode()) { @@ -331,7 +331,8 @@ public class ManualProcessor extends AbstractManualProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Manual manual) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.manualInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.manualInquire(aeiObjects.getWork().getActivityToken(), manual)); List results = new ArrayList<>(); // 仅有单条路由 if (aeiObjects.getRoutes().size() == 1) { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java index 052877b856..f0d040fafe 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java @@ -27,7 +27,7 @@ public class MergeProcessor extends AbstractMergeProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Merge merge) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.mergeArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.mergeArrive(aeiObjects.getWork().getActivityToken(), merge)); return aeiObjects.getWork(); } @@ -38,7 +38,7 @@ public class MergeProcessor extends AbstractMergeProcessor { @Override protected List executing(AeiObjects aeiObjects, Merge merge) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.mergeExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.mergeExecute(aeiObjects.getWork().getActivityToken(), merge)); List results = new ArrayList<>(); if (BooleanUtils.isNotTrue(aeiObjects.getWork().getSplitting())) { /* 如果不是一个拆分文档,直接通过 */ @@ -220,7 +220,7 @@ public class MergeProcessor extends AbstractMergeProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Merge merge) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.mergeInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.mergeInquire(aeiObjects.getWork().getActivityToken(), merge)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/message/MessageProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/message/MessageProcessor.java index 680c7245dd..06d1ea50e1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/message/MessageProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/message/MessageProcessor.java @@ -24,7 +24,8 @@ public class MessageProcessor extends AbstractMessageProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Message message) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.messageArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.messageArrive(aeiObjects.getWork().getActivityToken(), message)); return aeiObjects.getWork(); } @@ -36,7 +37,8 @@ public class MessageProcessor extends AbstractMessageProcessor { @Override protected List executing(AeiObjects aeiObjects, Message message) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.messageExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.messageExecute(aeiObjects.getWork().getActivityToken(), message)); MessageFactory.activity_message(aeiObjects.getWork(), null); List results = new ArrayList<>(); results.add(aeiObjects.getWork()); @@ -51,7 +53,8 @@ public class MessageProcessor extends AbstractMessageProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Message message) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.messageInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.messageInquire(aeiObjects.getWork().getActivityToken(), message)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ParallelProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ParallelProcessor.java index ded009fa9f..ecfe5154a0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ParallelProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ParallelProcessor.java @@ -33,7 +33,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Parallel parallel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.parallelArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.parallelArrive(aeiObjects.getWork().getActivityToken(), parallel)); logger.info( "parallel arrvie processing, work title:{}, id:{}, actvity name:{}, id:{}, activityToken:{}, process name:{}, id{}.", aeiObjects.getWork().getTitle(), aeiObjects.getWork().getId(), parallel.getName(), parallel.getId(), @@ -50,7 +51,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { @Override protected List executing(AeiObjects aeiObjects, Parallel parallel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken(), parallel)); List results = new ArrayList<>(); aeiObjects.getWork().setSplitting(true); aeiObjects.getWork().setSplitToken(StringTools.uniqueToken()); @@ -110,7 +112,8 @@ public class ParallelProcessor extends AbstractParallelProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Parallel parallel) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken(), parallel)); List results = new ArrayList<>(); aeiObjects.getRoutes().stream().forEach(o -> { if (StringUtils.equals(o.getId(), aeiObjects.getWork().getDestinationRoute())) { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/ServiceProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/ServiceProcessor.java index 06e4470c8f..cc204aa3d1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/ServiceProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/ServiceProcessor.java @@ -31,7 +31,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Service service) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.serviceArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.serviceArrive(aeiObjects.getWork().getActivityToken(), service)); // 清空上一次调用值 aeiObjects.getWork().getProperties().setServiceValue(new LinkedHashMap<>()); return aeiObjects.getWork(); @@ -45,7 +46,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { @Override protected List executing(AeiObjects aeiObjects, Service service) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.parallelExecute(aeiObjects.getWork().getActivityToken(), service)); List results = new ArrayList<>(); boolean passThrough = false; if (StringUtils.isNotEmpty(service.getScript()) || StringUtils.isNotEmpty(service.getScriptText())) { @@ -73,7 +75,8 @@ public class ServiceProcessor extends AbstractServiceProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Service service) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes() + .push(Signal.parallelInquire(aeiObjects.getWork().getActivityToken(), service)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/SplitProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/SplitProcessor.java index f8a2a6c6a0..d48f75d76a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/SplitProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/SplitProcessor.java @@ -32,7 +32,7 @@ public class SplitProcessor extends AbstractSplitProcessor { @Override protected Work arriving(AeiObjects aeiObjects, Split split) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.splitArrive(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.splitArrive(aeiObjects.getWork().getActivityToken(), split)); return aeiObjects.getWork(); } @@ -55,7 +55,7 @@ public class SplitProcessor extends AbstractSplitProcessor { } // 发送ProcessingSignal 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().getSplitValueList().add(splitValues.get(0)); @@ -100,7 +100,7 @@ public class SplitProcessor extends AbstractSplitProcessor { @Override protected List inquiring(AeiObjects aeiObjects, Split split) throws Exception { // 发送ProcessingSignal - aeiObjects.getProcessingAttributes().push(Signal.splitInquire(aeiObjects.getWork().getActivityToken())); + aeiObjects.getProcessingAttributes().push(Signal.splitInquire(aeiObjects.getWork().getActivityToken(), split)); List results = new ArrayList<>(); results.add(aeiObjects.getRoutes().get(0)); return results; -- GitLab