diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/test/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessorTest.java b/viewsh-module-iot/viewsh-module-iot-server/src/test/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessorTest.java
index d3becf1..fb8b1e1 100644
--- a/viewsh-module-iot/viewsh-module-iot-server/src/test/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessorTest.java
+++ b/viewsh-module-iot/viewsh-module-iot-server/src/test/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessorTest.java
@@ -87,12 +87,11 @@ class SignalLossRuleProcessorTest {
         CleanOrderIntegrationConfig mainConfig = new CleanOrderIntegrationConfig();
         mainConfig.setBeaconPresence(bpConfig);
         
-        CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper wrapper = 
+        CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper wrapper =
             new CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper();
         wrapper.setConfig(mainConfig);
         wrapper.setDeviceKey(DEVICE_KEY);
-        
-        when(configService.getConfigWrapperByDeviceId(DEVICE_ID)).thenReturn(wrapper);
+
         when(configService.getConfigByAreaIdAndRelationType(AREA_ID, "BEACON")).thenReturn(wrapper);
 
         // Execute
@@ -138,12 +137,11 @@ class SignalLossRuleProcessorTest {
         CleanOrderIntegrationConfig mainConfig = new CleanOrderIntegrationConfig();
         mainConfig.setBeaconPresence(bpConfig);
         
-        CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper wrapper = 
+        CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper wrapper =
             new CleanOrderIntegrationConfigService.AreaDeviceConfigWrapper();
         wrapper.setConfig(mainConfig);
         wrapper.setDeviceKey(DEVICE_KEY);
-        
-        when(configService.getConfigWrapperByDeviceId(DEVICE_ID)).thenReturn(wrapper);
+
         when(configService.getConfigByAreaIdAndRelationType(AREA_ID, "BEACON")).thenReturn(wrapper);
 
         // Execute
diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/area_device_relation_full_config.sql b/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/area_device_relation_full_config.sql
index 48c57ce..1b034fb 100644
--- a/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/area_device_relation_full_config.sql
+++ b/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/area_device_relation_full_config.sql
@@ -2,10 +2,13 @@
 -- 区域设备关联完整配置（三个设备各司其职）
 -- ============================================
 -- 设备类型说明：
---   BADGE           → buttonEvent（按键映射配置）
+--   BADGE           → 按键配置已移至 iot_device.config（设备级配置）
 --   BEACON          → beaconPresence（信标MAC + 窗口配置）
 --   TRAFFIC_COUNTER  → trafficThreshold（触发阈值配置）
 --
+-- 注意：buttonEvent 配置现在应该在 iot_device.config 字段中配置，
+--       而不是在 ops_area_device_relation.config_data 中
+--
 -- 已知设备信息：
 --   工牌：31(09207455611), 34(09207457042) | 产品: 19 / AOQwO9pJWKgfFTk4
 --   客流：32 | 产品: 21 / 82Zr08RUnstRHRO2
diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/badge_device_dispatch_test_data.sql b/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/badge_device_dispatch_test_data.sql
index c90e0ad..7c662e2 100644
--- a/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/badge_device_dispatch_test_data.sql
+++ b/viewsh-module-ops/viewsh-module-environment-biz/src/test/resources/sql/badge_device_dispatch_test_data.sql
@@ -56,7 +56,10 @@ DELETE FROM ops_area_device_relation WHERE device_id IN (2011, 2012, 2013, 2014,
 SET @TEST_PRODUCT_ID = 1;
 
 -- 插入测试设备关联
--- BADGE 类型设备配置：buttonEvent（按键事件）+ beaconPresence（信标检测）
+-- BADGE 类型设备配置：
+--   - buttonEvent（按键事件）应配置在 iot_device.config 中（设备级配置）
+--   - beaconPresence（信标��测）配置在 ops_area_device_relation.config_data 中（区域级配置）
+-- 注意：以下 buttonEvent 配置仅用于向后兼容测试，实际使用时请将 buttonEvent 配置移至 iot_device.config
 INSERT INTO `ops_area_device_relation` (`id`, `area_id`, `device_id`, `device_key`, `product_id`, `product_key`, `relation_type`, `config_data`, `enabled`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES
 -- A座2楼电梯厅设备（主要测试区域 - area_id=1300）
 (10000, 1300, 2011, 'BADGE_A2_E1', @TEST_PRODUCT_ID, 'BADGE_PRODUCT', 'BADGE',