修改完毕，解决From=1但是pre>1的问题

Author: qq_62395577

app-builder/waterflow/java/waterflow-service/src/main/java/modelengine/fit/waterflow/flowsengine/domain/flows/definitions/nodes/FlowConditionNode.java

@@ -21,7 +21,6 @@
 import modelengine.fit.waterflow.flowsengine.domain.flows.definitions.nodes.events.FlowEvent;
 import modelengine.fit.waterflow.flowsengine.domain.flows.streams.FitStream;
 import modelengine.fit.waterflow.flowsengine.domain.flows.streams.Processors;
-import modelengine.fit.waterflow.flowsengine.domain.flows.streams.To;
 import modelengine.fit.waterflow.flowsengine.domain.flows.streams.nodes.ConditionsNode;
 import modelengine.fit.waterflow.flowsengine.domain.flows.utils.FlowExecuteInfoUtil;
 import modelengine.fit.waterflow.flowsengine.utils.OhScriptExecutor;
@@ -81,7 +80,7 @@ public FitStream.Processor<FlowData, FlowData> getProcessor(String streamId, Flo
     protected void subscribe(
             FitStream.Publisher<FlowData> from, FitStream.Subscriber<FlowData, FlowData> to, FlowEvent event) {
         from.subscribe(event.getMetaId(), to, null, this.getWhether(from.getStreamId(), event));
-        to.setFanInMode(To.FanInMode.ALL);
+            to.setAllMode();
     }
 
     private Processors.Whether<FlowData> getWhether(String streamId, FlowEvent event) {

app-builder/waterflow/java/waterflow-service/src/main/java/modelengine/fit/waterflow/flowsengine/domain/flows/definitions/nodes/FlowNode.java

@@ -49,7 +49,6 @@
 import modelengine.fit.waterflow.flowsengine.domain.flows.enums.FlowNodeType;
 import modelengine.fit.waterflow.flowsengine.domain.flows.streams.FitStream;
 import modelengine.fit.waterflow.flowsengine.domain.flows.streams.Processors;
-import modelengine.fit.waterflow.flowsengine.domain.flows.streams.To;
 import modelengine.fit.waterflow.spi.FlowExceptionService;
 import modelengine.fitframework.broker.client.BrokerClient;
 import modelengine.fitframework.broker.client.filter.route.FitableIdFilter;
@@ -229,9 +228,8 @@ public FitStream.Subscriber<FlowData, FlowData> getSubscriber(String streamId, F
      * @param event {@link FlowEvent}节点之间的连线
      */
     public void subscribe(String streamId, FlowEnv flowEnv, FlowNode toNode, FlowEvent event) {
-        FitStream.Subscriber<FlowData, FlowData> toSubscriber = getTo(streamId, flowEnv.getRepo(),
-                flowEnv.getMessenger(), flowEnv.getLocks(), toNode);
-        toSubscriber.setFanInMode(To.FanInMode.ALL);
+        FitStream.Subscriber<FlowData, FlowData> toSubscriber = getTo(streamId, flowEnv.getRepo(), flowEnv.getMessenger(), flowEnv.getLocks(), toNode);
+        toSubscriber.setAllMode();
         this.subscribe(getFrom(streamId, flowEnv.getRepo(), flowEnv.getMessenger(), flowEnv.getLocks()),
                 toSubscriber, event);
     }

app-builder/waterflow/java/waterflow-service/src/main/java/modelengine/fit/waterflow/flowsengine/domain/flows/streams/To.java

@@ -579,14 +579,25 @@ public void setValidator(Processors.Validator<I> validator) {
     }
 
     public void setFanInMode(To.FanInMode fanInMode) {
-        this.fanInMode = Optional.ofNullable(fanInMode).orElse(To.FanInMode.ANY);
+        fanInMode = Optional.ofNullable(fanInMode).orElse(To.FanInMode.ANY);
+        // 当设置为ALL模式时，如果froms数量为1，则自动改为ANY模式
+        if (To.FanInMode.ALL.equals(fanInMode) && this.froms.size() == 1) {
+            this.fanInMode = To.FanInMode.ANY;
+        } else {
+            this.fanInMode = fanInMode;
+        }
     }
 
     /**
      * 设置为ALL模式，强制等待所有输入数据到齐后再处理
      */
     public void setAllMode() {
-        this.fanInMode = To.FanInMode.ALL;
+        // 当设置为ALL模式时，如果froms数量为1，则自动改为ANY模式
+        if (this.froms.size() == 1) {
+            this.fanInMode = To.FanInMode.ANY;
+        } else {
+            this.fanInMode = To.FanInMode.ALL;
+        }
     }
 
     /**