From 5767e8ade1046c6e8a0169804b8f1412175cbd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Jun 2025 14:46:03 +0800 Subject: [PATCH] =?UTF-8?q?tplinkapi=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=98=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/tplink/mapper/xml/AppCameraInfoMapper.xml | 13 ++++++++----- .../tplink/camera/mapper/xml/CameraInfoMapper.xml | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml index 7dbb54e..5fa822a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml @@ -28,7 +28,7 @@ a.nu_id as nuId, b.nu_name as nuName, ifnull(c.multitrans,0) as multitrans - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index @@ -46,6 +46,9 @@ AND a.region_name LIKE concat('%',#{params.regionName},'%') + + AND a.nu_id = #{params.nuId} + AND b.nu_name LIKE concat('%',#{params.nuName},'%') @@ -87,12 +90,12 @@ @@ -154,7 +157,7 @@ protocol as protocol, a.nu_id as nuId, b.nu_name as nuName - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id where a.nu_id = #{nuId} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index c766dde..82addc1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -47,6 +47,9 @@ AND a.region_name LIKE concat('%',#{params.regionName},'%') + + AND a.nu_id = #{params.nuId} + AND b.nu_name LIKE concat('%',#{params.nuName},'%')