~nishiwei/ard-uav-server.git

倪世伟 / ard-uav-server

forked from uav/ard-uav-server

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-06 ef497a4547843e1ade23d80f40bc682dca952ed0

 ard-device/src/main/resources/mapper/ArdCameraMapper.xml

@@ -234,6 +234,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>

			@@ -234,6 +234,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>