From 1837824a37c1a9e6c77280862abed282e7ca61b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 24 Dec 2025 13:51:09 +0800
Subject: [PATCH] 1. 开始航线增肌航线id用于判断是否是单次执行航线业务。 2. 增加判断无人机，禁飞区逻辑。
---
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index 94af829..658cfeb 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -8,7 +8,6 @@
<result property="id" column="id" />
<result property="name" column="name" />
<result property="path" column="path" />
-<!-- <result property="path1" column="path1" />-->
<result property="groupId" column="group_id" />
<result property="type" column="type" />
<result property="aircraft" column="aircraft" />
@@ -20,13 +19,13 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="pointCount" column="point_count" />
+ <result property="isLoop" column="is_loop" />
</resultMap>
<sql id="selectArdRouteInfoVo">
select id,
name,
path,
-<!-- path1,-->
group_id,
type,
aircraft,
@@ -37,7 +36,8 @@
create_time,
update_by,
update_time,
- point_count
+ point_count,
+ is_loop
from ard_route_info
</sql>
@@ -50,6 +50,7 @@
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="path != null and path != ''"> and path = #{path}</if>
<if test="groupId != null"> and group_id = #{groupId}</if>
+ <if test="isLoop != null"> and is_loop = #{isLoop}</if>
</where>
<if test="orderByTime == null and orderByTime == ''">
ORDER BY update_time DESC
@@ -71,7 +72,6 @@
<if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="path != null">path,</if>
-<!-- <if test="path1 != null">path1,</if>-->
<if test="groupId != null">group_id,</if>
<if test="type != null">type,</if>
<if test="aircraft != null">aircraft,</if>
@@ -83,12 +83,12 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="pointCount != null">point_count,</if>
+ <if test="isLoop != null">is_loop,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="path != null">#{path},</if>
-<!-- <if test="path1 != null">#{path1},</if>-->
<if test="groupId != null">#{groupId},</if>
<if test="type != null">#{type},</if>
<if test="aircraft != null">#{aircraft},</if>
@@ -100,6 +100,7 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="pointCount != null">#{pointCount},</if>
+ <if test="isLoop != null">#{isLoop},</if>
</trim>
</insert>
@@ -108,7 +109,6 @@
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="path != null">path = #{path},</if>
-<!-- <if test="path1 != null">path1 = #{path1},</if>-->
<if test="groupId != null">group_id = #{groupId},</if>
<if test="type != null">type = #{type},</if>
<if test="aircraft != null">aircraft = #{aircraft},</if>
@@ -120,6 +120,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="pointCount != null">point_count = #{pointCount},</if>
+ <if test="isLoop != null">is_loop = #{isLoop},</if>
</trim>
where id = #{id}
</update>
@@ -148,7 +149,7 @@
</delete>
<select id="selectArdRouteInfoByGroupId" parameterType="String" resultMap="ArdRouteInfoResult">
- select id,name,path,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time,point_count from ard_route_info
+ select id,name,path,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time,point_count,is_loop from ard_route_info
<where>
<if test="groupId != null "> and group_id = #{groupId}</if>
</where>
--
Gitblit v1.9.3