!1505 perf(iot):【场景联动】优化

Merge pull request !1505 from puhui999/feature/iot

yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java

@@ -99,6 +99,17 @@ public class IotDeviceMessageUtils {
         return false;
     }
 
+    /**
+     * 判断消息中是否不包含指定的标识符
+     *
+     * @param message    消息
+     * @param identifier 要检查的标识符
+     * @return 是否不包含
+     */
+    public static boolean notContainsIdentifier(IotDeviceMessage message, String identifier) {
+        return !containsIdentifier(message, identifier);
+    }
+
     /**
      * 将 params 解析为 Map
      *
@@ -196,6 +207,44 @@ public class IotDeviceMessageUtils {
         return null;
     }
 
+    /**
+     * 从服务调用消息中提取输入参数
+     * <p>
+     * 服务调用消息的 params 结构通常为：
+     * {
+     * "identifier": "serviceIdentifier",
+     * "inputData": { ... } 或 "inputParams": { ... }
+     * }
+     *
+     * @param message 设备消息
+     * @return 输入参数 Map，如果未找到则返回 null
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> extractServiceInputParams(IotDeviceMessage message) {
+        Object params = message.getParams();
+        if (params == null) {
+            return null;
+        }
+        if (!(params instanceof Map)) {
+            return null;
+        }
+        Map<String, Object> paramsMap = (Map<String, Object>) params;
+
+        // 尝试从 inputData 字段获取
+        Object inputData = paramsMap.get("inputData");
+        if (inputData instanceof Map) {
+            return (Map<String, Object>) inputData;
+        }
+
+        // 尝试从 inputParams 字段获取
+        Object inputParams = paramsMap.get("inputParams");
+        if (inputParams instanceof Map) {
+            return (Map<String, Object>) inputParams;
+        }
+
+        return null;
+    }
+
     // ========== Topic 相关 ==========
 
     public static String buildMessageBusGatewayDeviceMessageTopic(String serverId) {

yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.iot.core.util;
 
+import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * {@link IotDeviceMessageUtils} 的单元测试
@@ -138,4 +138,72 @@ public class IotDeviceMessageUtilsTest {
         Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature");
         assertEquals(25.5, result); // 应该返回直接标识符的值
     }
+
+    // ========== notContainsIdentifier 测试 ==========
+
+    /**
+     * 测试 notContainsIdentifier 与 containsIdentifier 的互补性
+     * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性**
+     * **Validates: Requirements 4.1**
+     */
+    @Test
+    public void testNotContainsIdentifier_complementary_whenContains() {
+        // 准备参数：消息包含指定标识符
+        IotDeviceMessage message = new IotDeviceMessage();
+        message.setMethod(IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod());
+        Map<String, Object> params = new HashMap<>();
+        params.put("temperature", 25);
+        message.setParams(params);
+        String identifier = "temperature";
+
+        // 调用 & 断言：验证互补性
+        boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier);
+        boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier);
+        assertTrue(containsResult);
+        assertFalse(notContainsResult);
+        assertEquals(!containsResult, notContainsResult);
+    }
+
+    /**
+     * 测试 notContainsIdentifier 与 containsIdentifier 的互补性
+     * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性**
+     * **Validates: Requirements 4.1**
+     */
+    @Test
+    public void testNotContainsIdentifier_complementary_whenNotContains() {
+        // 准备参数：消息不包含指定标识符
+        IotDeviceMessage message = new IotDeviceMessage();
+        message.setMethod(IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod());
+        Map<String, Object> params = new HashMap<>();
+        params.put("temperature", 25);
+        message.setParams(params);
+        String identifier = "humidity";
+
+        // 调用 & 断言：验证互补性
+        boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier);
+        boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier);
+        assertFalse(containsResult);
+        assertTrue(notContainsResult);
+        assertEquals(!containsResult, notContainsResult);
+    }
+
+    /**
+     * 测试 notContainsIdentifier 与 containsIdentifier 的互补性 - 空参数场景
+     * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性**
+     * **Validates: Requirements 4.1**
+     */
+    @Test
+    public void testNotContainsIdentifier_complementary_nullParams() {
+        // 准备参数：params 为 null
+        IotDeviceMessage message = new IotDeviceMessage();
+        message.setParams(null);
+        String identifier = "temperature";
+
+        // 调用 & 断言：验证互补性
+        boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier);
+        boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier);
+        assertFalse(containsResult);
+        assertTrue(notContainsResult);
+        assertEquals(!containsResult, notContainsResult);
+    }
 }