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

zhaowenyu

2025-12-24 19763ebd20ad16435f3c1ccfdc8abd1518712cc1

 ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml

@@ -18,6 +18,8 @@
        <result property="createTime"    column="create_time"    />
        <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">
@@ -33,7 +35,9 @@
               create_by,
               create_time,
               update_by,
               update_time
               update_time,
               point_count,
               is_loop
        from ard_route_info
    </sql>

@@ -46,7 +50,11 @@
            <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
        </if>
        <!-- 动态排序 -->
        <if test="orderByTime != null and orderByTime != ''">
            ORDER BY update_time ${orderByTime}
@@ -74,6 +82,8 @@
            <if test="createTime != null">create_time,</if>
            <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>
@@ -89,6 +99,8 @@
            <if test="createTime != null">#{createTime},</if>
            <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>

@@ -107,6 +119,8 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <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>
@@ -135,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 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>