diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml
index 6421434..3ada5b5 100644
--- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml
+++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml
@@ -7,9 +7,9 @@
     SELECT
         b.*
     FROM
-        fk_device a
+        fk_meter_device a
         JOIN fk_device_signal b ON ( a.device_id = b.device_id )
-        JOIN fk_system_device c ON ( a.netdevice_ip = c.ip_addr )
+        JOIN fk_gateway_device c ON ( a.netdevice_ip = c.ip_addr )
     WHERE
         c.ip_addr = #{slave_ip}
 
@@ -20,9 +20,9 @@
     SELECT
         b.*
     FROM
-        fk_device a
+        fk_meter_device a
         JOIN fk_device_signal b ON ( a.device_id = b.device_id )
-        JOIN fk_system_device c ON ( a.netdevice_ip = c.ip_addr )
+        JOIN fk_gateway_device c ON ( a.netdevice_ip = c.ip_addr )
     WHERE
         c.ip_addr = #{slave_ip}
 
@@ -37,9 +37,9 @@
         a.device_name,
         b.*
         FROM
-        fk_device a
+        fk_meter_device a
         JOIN fk_device_signal b ON ( a.device_id = b.device_id )
-        JOIN fk_system_device c ON ( a.netdevice_ip = c.ip_addr )
+        JOIN fk_gateway_device c ON ( a.netdevice_ip = c.ip_addr )
         WHERE
         c.ip_addr = #{slave_ip}
         <if test="type=='yx'">
@@ -48,6 +48,7 @@
         <if test="type=='yc'">
             and b.yc_addr = #{address}
         </if>
+        limit 1
     </select>
 
     <!-- 查询辅控设备信号表-->
@@ -58,7 +59,7 @@
         a.device_name,
         b.*
         FROM
-        fk_device a
+        fk_meter_device a
         JOIN fk_device_signal b ON ( a.device_id = b.device_id )
         WHERE
         1 =1