From a77f5dbbc62d0edd2c49c19f9c60dab0bdb7a13c Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 10 Jan 2023 13:34:44 +0800 Subject: [PATCH] fixed #232 --- .../executor/DeviceMessageSendTaskExecutorProvider.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/DeviceMessageSendTaskExecutorProvider.java b/jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/DeviceMessageSendTaskExecutorProvider.java index 07490b75..12eb1763 100755 --- a/jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/DeviceMessageSendTaskExecutorProvider.java +++ b/jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/DeviceMessageSendTaskExecutorProvider.java @@ -1,5 +1,6 @@ package org.jetlinks.community.rule.engine.executor; +import com.google.common.collect.Maps; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -232,11 +233,7 @@ public class DeviceMessageSendTaskExecutorProvider implements TaskExecutorProvid if (!CollectionUtils.isEmpty(properties)) { message.setProperties( - properties - .entrySet() - .stream() - .map(prop -> Tuples.of(prop.getKey(), ExpressionUtils.analytical(String.valueOf(prop.getValue()), ctx, "spel"))) - .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2)) + Maps.transformValues(properties, v -> VariableSource.of(v).resolveStatic(ctx)) ); }