Merge pull request alibaba#40 from coyote-wang/master

增加流程id查询参数
coyote-wang · Apr 18, 2021 · fdf9309 · fdf9309
2 parents 6389328 + 71597c9
commit fdf9309
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...in/java/com/alibaba/smart/framework/engine/instance/storage/ExecutionInstanceStorage.java b/...in/java/com/alibaba/smart/framework/engine/instance/storage/ExecutionInstanceStorage.java
@@ -17,6 +17,9 @@ void update(ExecutionInstance executionInstance,
     ExecutionInstance find(String executionInstanceId,
                            ProcessEngineConfiguration processEngineConfiguration);
 
+    ExecutionInstance find(String processInstanceId, String executionInstanceId,
+            ProcessEngineConfiguration processEngineConfiguration);
+
     void remove(String executionInstanceId,
                 ProcessEngineConfiguration processEngineConfiguration);
 

diff --git a/...m/alibaba/smart/framework/engine/service/command/impl/DefaultExecutionCommandService.java b/...m/alibaba/smart/framework/engine/service/command/impl/DefaultExecutionCommandService.java
@@ -152,12 +152,11 @@ public ProcessInstance signal(String processInstanceId, String executionInstance
     }
 
     protected ExecutionInstance queryExecutionInstance(String processInstanceId, String executionInstanceId) {
-        List<ExecutionInstance> executionInstances = executionInstanceStorage
-                .findByActivityInstanceId(processInstanceId, executionInstanceId, processEngineConfiguration);
-        if(CollectionUtil.isEmpty(executionInstances)) {
+        ExecutionInstance executionInstance = executionInstanceStorage.find(processInstanceId,executionInstanceId,processEngineConfiguration);
+
+        if (null == executionInstance) {
             throw new EngineException("No executionInstance found for id " + executionInstanceId);
         }
-        ExecutionInstance executionInstance = executionInstances.get(0);
 
         if (!executionInstance.isActive()) {
             throw new ConcurrentException("The status of signaled executionInstance should be active");
@@ -176,7 +175,6 @@ protected ExecutionInstance queryExecutionInstance(String executionInstanceId) {
 
         if (!executionInstance.isActive()) {
             throw new ConcurrentException("The status of signaled executionInstance should be active");
-
         }
         return executionInstance;
     }