From cb5456418b3dbb1dfc9585c7c63fa3a90ef9c5ef 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 11:49:17 +0800 Subject: [PATCH] =?UTF-8?q?tplink=E8=8E=B7=E5=8F=96=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E5=8D=95=E5=85=83=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/tplink/camera/entity/CameraInfo.java | 2 +- .../modules/tplink/camera/mapper/xml/CameraInfoMapper.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index 67ce1b9..8db827a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -133,7 +133,7 @@ public class CameraInfo implements Serializable { private String topTime; /**护理单元*/ @ApiModelProperty(value = "护理单元ID") - @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "id") + @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "nu_id") private String nuId; /**护理单元*/ @ApiModelProperty(value = "护理单元") 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 203ad6d..42965c4 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 @@ -29,7 +29,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 @@ -85,7 +85,7 @@ record_plan_id as recordPlanId, 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 AND a.project_id = #{projectId} @@ -129,12 +129,12 @@