Merge remote-tracking branch 'origin/master'

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/DeviceAlarmModelParser.java

@@ -69,7 +69,7 @@ public class DeviceAlarmModelParser implements RuleModelParserStrategy {
                 //定时节点
                 //TimerTaskExecutorProvider
                 RuleNodeModel timer = new RuleNodeModel();
-                timer.setId("timer:" + (++index));
+                timer.setId("timer:" + (index));
                 timer.setName("定时发送设备消息");
                 timer.setExecutor("timer");
                 timer.setConfiguration(Collections.singletonMap("cron", timerTrigger.getCron()));
@@ -91,7 +91,7 @@ public class DeviceAlarmModelParser implements RuleModelParserStrategy {
                 //设备指令发送节点
                 //DeviceMessageSendTaskExecutorProvider
                 RuleNodeModel messageSender = new RuleNodeModel();
-                messageSender.setId("message-sender:" + (++index));
+                messageSender.setId("message-sender:" + (index));
                 messageSender.setName("定时发送设备消息");
                 messageSender.setExecutor("device-message-sender");
                 messageSender.setConfiguration(senderDeviceMessageSendConfig.toMap());
@@ -118,6 +118,7 @@ public class DeviceAlarmModelParser implements RuleModelParserStrategy {
                 toAlarm.setTarget(conditionNode);
                 messageSender.getOutputs().add(toAlarm);
                 conditionNode.getInputs().add(toAlarm);
+                index++;
             }
         }