【同步】BOOT 和 CLOUD 的功能

Author: YunaiV

yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java

@@ -10,10 +10,10 @@
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleActionTypeEnum;
 import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
 import cn.iocoder.yudao.module.iot.service.device.message.IotDeviceMessageService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**

yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java

@@ -10,10 +10,10 @@
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleActionTypeEnum;
 import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
 import cn.iocoder.yudao.module.iot.service.device.message.IotDeviceMessageService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 

yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java

@@ -12,6 +12,7 @@
 
 import java.util.*;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 
@@ -46,16 +47,16 @@ public IotSceneRuleMatcherManager(List<IotSceneRuleMatcher> matchers) {
         List<IotSceneRuleMatcher> allMatchers = matchers.stream()
                 .filter(IotSceneRuleMatcher::isEnabled)
                 .sorted(Comparator.comparing(IotSceneRuleMatcher::getPriority))
-                .toList();
+                .collect(Collectors.toList());
         // 1.2 分离触发器匹配器和条件匹配器
         List<IotSceneRuleTriggerMatcher> triggerMatchers = allMatchers.stream()
                 .filter(matcher -> matcher instanceof IotSceneRuleTriggerMatcher)
                 .map(matcher -> (IotSceneRuleTriggerMatcher) matcher)
-                .toList();
+                .collect(Collectors.toList());
         List<IotSceneRuleConditionMatcher> conditionMatchers = allMatchers.stream()
                 .filter(matcher -> matcher instanceof IotSceneRuleConditionMatcher)
                 .map(matcher -> (IotSceneRuleConditionMatcher) matcher)
-                .toList();
+                .collect(Collectors.toList());
 
         // 2.1 构建触发器匹配器映射表
         this.triggerMatchers = convertMap(triggerMatchers, IotSceneRuleTriggerMatcher::getSupportedTriggerType,