From 24681c81c09022f584a57006f2534b5f74723414 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 30 六月 2026 09:27:31 +0800
Subject: [PATCH] 初始化项目

---
 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java
index 6b8c73a..183442e 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java
@@ -5,7 +5,9 @@
 import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
 import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 /**
@@ -15,6 +17,9 @@
  */
 @Component
 public class IotDeviceStateUpdateTriggerMatcher implements IotSceneRuleTriggerMatcher {
+
+    @Resource
+    private IotDeviceService iotDeviceService;
 
     @Override
     public IotSceneRuleTriggerTypeEnum getSupportedTriggerType() {
@@ -36,7 +41,13 @@
             return false;
         }
 
-        // 1.3 妫�鏌ユ搷浣滅鍜屽�兼槸鍚︽湁鏁�
+        // 1.3 淇瑙﹀彂鍣ㄤ腑蹇界暐浜嗕骇鍝佸拰璁惧鐨勪竴鑷存�ч獙璇侊紝2025.05.25 by panda
+        if (IotSceneRuleMatcherHelper.productAndDeviceNotMatched(message, trigger.getProductId(),trigger.getDeviceId())){
+            IotSceneRuleMatcherHelper.logTriggerMatchFailure(message,trigger,"瑙﹀彂鍣ㄤ腑浜у搧鎴栬澶囦笉鍖归厤");
+            return false;
+        }
+
+        // 1.4 妫�鏌ユ搷浣滅鍜屽�兼槸鍚︽湁鏁�
         if (!IotSceneRuleMatcherHelper.isTriggerOperatorAndValueValid(trigger)) {
             IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "鎿嶄綔绗︽垨鍊兼棤鏁�");
             return false;

--
Gitblit v1.9.3