From de026326a9df6f4a2192e99cf0e53e7e7b6d445d Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 24 Oct 2025 17:29:33 +0800
Subject: [PATCH] 1.整理文件管理文件路径。 2.新增航线信息接口业务。 3.优化KMZ文件接口业务逻辑。 4.pom文件修改。 5.增加业务工具类。 6.增加部分业务注解。 7.增加修改无人机状态方法。
---
ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
index 29385ce..f3b8ac0 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
@@ -1,25 +1,34 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.route.mapper.ArdRouteFolderMapper">
-
+
<resultMap type="ArdRouteFolder" id="ArdRouteFolderResult">
<result property="id" column="id" />
<result property="fileName" column="file_name" />
+ <result property="serialNumber" column="serial_number" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <!-- 关联 ArdRouteFile 对象 -->
+ <association property="ardRouteFile"
+ javaType="com.ard.route.domain.route.ArdRouteFile"
+ column="folder_id"
+ autoMapping="true"
+ select="selectArdRouteFile">
+ </association>
</resultMap>
- <select id="selectArdRouteFile" resultType="com.ard.route.domain.ArdRouteFile">
+ <select id="selectArdRouteFile" resultType="com.ard.route.domain.route.ArdRouteFile">
select * from ard_route_file where id = #{folderId}
</select>
<sql id="selectArdRouteFolderVo">
select id,
file_name,
+ serial_number,
create_by,
create_time,
update_by,
@@ -29,11 +38,15 @@
<select id="selectArdRouteFolderList" parameterType="ArdRouteFolder" resultMap="ArdRouteFolderResult">
<include refid="selectArdRouteFolderVo"/>
- <where>
+ <where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
+ <if test="createdTime != null "> and created_time = #{createdTime}</if>
+ <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
+ <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
</where>
</select>
-
+
<select id="selectArdRouteFolderById" parameterType="String" resultMap="ArdRouteFolderResult">
<include refid="selectArdRouteFolderVo"/>
where id = #{id}
@@ -44,25 +57,28 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="fileName != null">file_name,</if>
+ <if test="serialNumber != null">serial_number,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="fileName != null">#{fileName},</if>
+ <if test="serialNumber != null">#{serialNumber},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdRouteFolder" parameterType="ArdRouteFolder">
update ard_route_folder
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
+ <if test="serialNumber != null">serial_number = #{serialNumber},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -76,7 +92,7 @@
</delete>
<delete id="deleteArdRouteFolderByIds" parameterType="String">
- delete from ard_route_folder where id in
+ delete from ard_route_folder where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
--
Gitblit v1.9.3