From 310b1cc5c6e325657d687cb3de367a1680a0f3f5 Mon Sep 17 00:00:00 2001
From: weitang <pechji9114@163.com>
Date: Thu, 24 Apr 2025 10:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/auxcontrol/DeviceSignalMapper.xml      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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