From f6d36a864d02baec4b628f9a8675b1f8ebf207c2 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 03 Nov 2025 16:58:00 +0800
Subject: [PATCH] 2025-11-3 zwy 飞行器实时状态中data中增加飞行器sn字段

---
 ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml |   65 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
index 25bde7e..f3b8ac0 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
@@ -1,42 +1,44 @@
 <?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="createdBy"    column="created_by"    />
-        <result property="createdTime"    column="created_time"    />
-        <result property="updatedBy"    column="updated_by"    />
-        <result property="updatedTime"    column="updated_time"    />
+        <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.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,
-               created_by,
-               created_time,
-               updated_by,
-               updated_time
+               serial_number,
+               create_by,
+               create_time,
+               update_by,
+               update_time
         from ard_route_folder
     </sql>
 
     <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>
@@ -44,7 +46,7 @@
             <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
         </where>
     </select>
-    
+
     <select id="selectArdRouteFolderById" parameterType="String" resultMap="ArdRouteFolderResult">
         <include refid="selectArdRouteFolderVo"/>
         where id = #{id}
@@ -55,29 +57,32 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="fileName != null">file_name,</if>
-            <if test="createdBy != null">created_by,</if>
-            <if test="createdTime != null">created_time,</if>
-            <if test="updatedBy != null">updated_by,</if>
-            <if test="updatedTime != null">updated_time,</if>
-         </trim>
+            <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 prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="fileName != null">#{fileName},</if>
-            <if test="createdBy != null">#{createdBy},</if>
-            <if test="createdTime != null">#{createdTime},</if>
-            <if test="updatedBy != null">#{updatedBy},</if>
-            <if test="updatedTime != null">#{updatedTime},</if>
-         </trim>
+            <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>
     </insert>
 
     <update id="updateArdRouteFolder" parameterType="ArdRouteFolder">
         update ard_route_folder
         <trim prefix="SET" suffixOverrides=",">
             <if test="fileName != null">file_name = #{fileName},</if>
-            <if test="createdBy != null">created_by = #{createdBy},</if>
-            <if test="createdTime != null">created_time = #{createdTime},</if>
-            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-            <if test="updatedTime != null">updated_time = #{updatedTime},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -87,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