From 63e503016c78aac218a4c7f9a765bcbb0b1e398e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 24 Nov 2025 12:27:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-device/src/main/resources/mapper/ArdCameraMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ard-device/src/main/resources/mapper/ArdCameraMapper.xml b/ard-device/src/main/resources/mapper/ArdCameraMapper.xml
index e764bdf..cf87cad 100644
--- a/ard-device/src/main/resources/mapper/ArdCameraMapper.xml
+++ b/ard-device/src/main/resources/mapper/ArdCameraMapper.xml
@@ -19,6 +19,7 @@
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
<result property="altitude" column="altitude"/>
+ <result property="dockId" column="dock_id"/>
<result property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="loginId" column="login_id"/>
@@ -78,6 +79,7 @@
c.longitude,
c.latitude,
c.altitude,
+ c.dock_id,
c.user_id,
c.dept_id,
c.login_id,
@@ -108,6 +110,7 @@
<if test="longitude != null ">and c.longitude = #{longitude}</if>
<if test="latitude != null ">and c.latitude = #{latitude}</if>
<if test="altitude != null ">and c.altitude = #{altitude}</if>
+ <if test="dockId != null ">and c.dock_id = #{dockId}</if>
<if test="loginId != null ">and c.login_id = #{loginId}</if>
<if test="state != null ">and c.state = #{state}</if>
<if test="deptId != null and deptId != 0">
@@ -145,6 +148,7 @@
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="altitude != null">altitude,</if>
+ <if test="dockId != null">dock_id,</if>
<if test="loginId != null">login_id,</if>
<if test="deptId != null">dept_id,</if>
<if test="userId != null">user_id,</if>
@@ -169,6 +173,7 @@
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="altitude != null">#{altitude},</if>
+ <if test="dockId != null">#{dockId},</if>
<if test="loginId != null">#{loginId},</if>
<if test="deptId != null">#{deptId},</if>
<if test="userId != null">#{userId},</if>
@@ -196,6 +201,8 @@
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="altitude != null">altitude = #{altitude},</if>
+ <!-- 简洁写法：直接设置值，包括null -->
+ dock_id = #{dockId},
<if test="loginId != null">login_id = #{loginId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
@@ -228,6 +235,9 @@
where ip = #{ip}
and port = #{port} limit 1
</select>
+ <select id="checkAirportHasCamera" resultMap="ArdCameraResult">
+ select * from ard_camera where dock_id = #{dockId} limit 1
+ </select>
<update id="resetCameraLoginId" parameterType="ArdCamera">
update ard_camera set login_id = -1 where id = #{id}
</update>
--
Gitblit v1.9.3