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/IotDevicePropertyConditionMatcher.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java
index 5741b95..f2c92ae 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java
@@ -30,14 +30,20 @@
return false;
}
- // 1.2 妫�鏌ユ秷鎭腑鏄惁鍖呭惈鏉′欢鎸囧畾鐨勫睘鎬ф爣璇嗙
+ // 1.2 淇鏉′欢鍖归厤涓拷鐣ヤ簡浜у搧鍜岃澶囩殑涓�鑷存�ч獙璇侊紝2025.05.25 by panda
+ if (IotSceneRuleMatcherHelper.productAndDeviceNotMatched(message, condition.getProductId(),condition.getDeviceId())){
+ IotSceneRuleMatcherHelper.logConditionMatchFailure(message,condition,"鏉′欢鍖归厤鍣ㄤ腑浜у搧鎴栬澶囦笉鍖归厤");
+ return false;
+ }
+
+ // 1.3 妫�鏌ユ秷鎭腑鏄惁鍖呭惈鏉′欢鎸囧畾鐨勫睘鎬ф爣璇嗙
// 娉ㄦ剰锛氬睘鎬т笂鎶ュ彲鑳藉悓鏃朵笂鎶ュ涓睘鎬э紝鎵�浠ラ渶瑕佸垽鏂� condition.getIdentifier() 鏄惁鍦� message 鐨� params 涓�
if (IotDeviceMessageUtils.notContainsIdentifier(message, condition.getIdentifier())) {
IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "娑堟伅涓笉鍖呭惈灞炴��: " + condition.getIdentifier());
return false;
}
- // 1.3 妫�鏌ユ搷浣滅鍜屽弬鏁版槸鍚︽湁鏁�
+ // 1.4 妫�鏌ユ搷浣滅鍜屽弬鏁版槸鍚︽湁鏁�
if (!IotSceneRuleMatcherHelper.isConditionOperatorAndParamValid(condition)) {
IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "鎿嶄綔绗︽垨鍙傛暟鏃犳晥");
return false;
--
Gitblit v1.9.3