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/condition/IotDeviceStateConditionMatcher.java |    7 ++++++-
 1 files changed, 6 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/condition/IotDeviceStateConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcher.java
index 2328122..15dcbbd 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcher.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcher.java
@@ -27,8 +27,13 @@
             IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "鏉′欢鍩虹鍙傛暟鏃犳晥");
             return false;
         }
+        // 1.2 淇鏉′欢鍖归厤涓拷鐣ヤ簡浜у搧鍜岃澶囩殑涓�鑷存�ч獙璇侊紝2025.05.25 by panda
+        if (IotSceneRuleMatcherHelper.productAndDeviceNotMatched(message, condition.getProductId(),condition.getDeviceId())){
+            IotSceneRuleMatcherHelper.logConditionMatchFailure(message,condition,"鏉′欢鍖归厤鍣ㄤ腑浜у搧鎴栬澶囦笉鍖归厤");
+            return false;
+        }
 
-        // 1.2 妫�鏌ユ搷浣滅鍜屽弬鏁版槸鍚︽湁鏁�
+        // 1.3 妫�鏌ユ搷浣滅鍜屽弬鏁版槸鍚︽湁鏁�
         if (!IotSceneRuleMatcherHelper.isConditionOperatorAndParamValid(condition)) {
             IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "鎿嶄綔绗︽垨鍙傛暟鏃犳晥");
             return false;

--
Gitblit v1.9.3