From 6efc7cf8fea4b01efb7f7ad82eb3ff916970e7b6 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:47:20 +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=E4=BF=A1=E6=81=AF=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/modules/tplink/camera/entity/CameraInfo.java  |  2 +-
 .../tplink/camera/mapper/xml/CameraInfoMapper.xml    | 12 ++++++------
 .../java/com/nu/modules/tplink/utils/TumsApi.java    |  3 +--
 3 files changed, 8 insertions(+), 9 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 5d1a90f..bc6297c 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 = "护理单元编码")
-	@Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "code")
+	@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 a672a96..c766dde 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
         <where>
             <if test="params.deviceIndex != null and params.deviceIndex != ''">
@@ -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
         <where>
             <if test="projectId != null and projectId != ''">
                 AND a.project_id = #{projectId}
@@ -129,12 +129,12 @@
 
     <select id="findNuPage" parameterType="com.nu.modules.tplink.camera.entity.CameraInfo" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
         select
-        code as nuId,
-        nu_name as nuName
+            nu_id as nuId,
+            nu_name as nuName
         from nu_base_info b
         <where>
             <if test="params.nuId != null and params.nuId != ''">
-                AND b.code = #{params.nuId}
+                AND b.nu_id = #{params.nuId}
             </if>
             <if test="params.nuName != null and params.nuName != ''">
                 AND b.nu_name LIKE concat('%',#{params.nuName},'%')
@@ -167,7 +167,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 device_index = #{deviceIndex}
     </select>
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java
index f638ca0..a4b7dd9 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java
@@ -44,8 +44,7 @@ public class TumsApi {
 
     private void initTumsConfig(){
         if(tumsConfig==null){
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            tumsConfig = tumsConfigMapper.getByCode(sysUser.getOrgCode());
+            tumsConfig = tumsConfigMapper.getByCode(null);
         }
     }