From 7077d3a7819de3229482e5a9edb4bd895ea2a49f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index dafd26d..6c78ec8 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -10,7 +10,7 @@
<result property="boxName" column="box_name" />
<result property="boxVersion" column="box_version" />
<result property="startTime" column="start_time" />
- <result property="onLine" column="onLine" />
+ <result property="onLine" column="on_line" />
<result property="videoServer" column="video_server" />
<result property="videoPort" column="video_port" />
<result property="lastTaskId" column="last_task_id" />
@@ -196,4 +196,12 @@
</foreach>
</insert>
+ <update id="updateDroneStatus">
+ update ard_drone_info
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="onLine != null">on_line = #{onLine},</if>
+ </trim>
+ where server_id = #{serverId}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3