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

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

 ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml

@@ -20,6 +20,23 @@
        <result property="serverStatus"    column="server_status"    />
    </resultMap>

    <sql id="selectArdServerInfoVoNo">
        select id,
               server_name,
               host,
               tcp_port,
               http_port,
               access_key_id,
               access_key_secret,
               longitude,
               latitude,
               altitude,
               user_id,
               dept_id,
               server_status
        from ard_server
    </sql>

    <sql id="selectArdServerInfoVo">
        select c.id,
               c.server_name,
@@ -34,7 +51,7 @@
               c.user_id,
               c.dept_id,
               c.server_status
        from ard_server_info c
        from ard_server c
                 left join sys_dept d on d.dept_id = c.dept_id
                 left join sys_user u on u.user_id = c.user_id
    </sql>
@@ -61,7 +78,7 @@
    </select>

    <insert id="insertArdServerInfo" parameterType="ArdServerInfo">
        insert into ard_server_info
        insert into ard_server
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="serverName != null">server_name,</if>
@@ -95,7 +112,7 @@
    </insert>

    <update id="updateArdServerInfo" parameterType="ArdServerInfo">
        update ard_server_info
        update ard_server
        <trim prefix="SET" suffixOverrides=",">
            <if test="serverName != null">server_name = #{serverName},</if>
            <if test="host != null">host = #{host},</if>
@@ -114,7 +131,7 @@
    </update>

    <update id="updateServerStatus">
        update ard_server_info
        update ard_server
        <trim prefix="SET" suffixOverrides=",">
            <if test="status != null">server_status = #{status},</if>
        </trim>
@@ -122,13 +139,19 @@
    </update>

    <delete id="deleteArdServerInfoById" parameterType="String">
        delete from ard_server_info where id = #{id}
        delete from ard_server where id = #{id}
    </delete>

    <delete id="deleteArdServerInfoByIds" parameterType="String">
        delete from ard_server_info where id in
        delete from ard_server where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

    <select id="getServerIdsList" resultType="String">
        SELECT id
        FROM ard_server
        where server_status = "1"
    </select>
</mapper>