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/IotDeviceServiceInvokeTriggerMatcher.java | 12 +++++++++++-
1 files changed, 11 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/IotDeviceServiceInvokeTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java
index 842d081..5dcde66 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java
@@ -7,7 +7,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;
import java.util.Map;
@@ -19,6 +21,9 @@
*/
@Component
public class IotDeviceServiceInvokeTriggerMatcher implements IotSceneRuleTriggerMatcher {
+
+ @Resource
+ private IotDeviceService iotDeviceService;
@Override
public IotSceneRuleTriggerTypeEnum getSupportedTriggerType() {
@@ -37,7 +42,12 @@
IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "娑堟伅鏂规硶涓嶅尮閰嶏紝鏈熸湜: " + IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod() + ", 瀹為檯: " + message.getMethod());
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 妫�鏌ユ爣璇嗙鏄惁鍖归厤
String messageIdentifier = IotDeviceMessageUtils.getIdentifier(message);
if (!IotSceneRuleMatcherHelper.isIdentifierMatched(trigger.getIdentifier(), messageIdentifier)) {
IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "鏍囪瘑绗︿笉鍖归厤锛屾湡鏈�: " + trigger.getIdentifier() + ", 瀹為檯: " + messageIdentifier);
--
Gitblit v1.9.3