From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
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