From f905f4377db462640a4fdd53dc5daa1adfc8c542 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 14 Oct 2025 18:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index 4bd8f5e..f7022d2 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -20,7 +20,7 @@
<result property="serverStatus" column="server_status" />
</resultMap>
- <sql id="selectArdServerManagementVo">
+ <sql id="selectArdServerInfoVo">
select c.id,
c.server_name,
c.host,
@@ -39,8 +39,8 @@
left join sys_user u on u.user_id = c.user_id
</sql>
- <select id="selectArdServerManagementList" parameterType="ArdServerInfo" resultMap="ArdServerManagementResult">
- <include refid="selectArdServerManagementVo"/>
+ <select id="selectArdServerInfoList" parameterType="ArdServerInfo" resultMap="ArdServerInfoResult">
+ <include refid="selectArdServerInfoVo"/>
<where>
<if test="id != null and id != ''"> and c.id = #{id}</if>
<if test="serverName != null and serverName != ''"> and server_name like c.concat('%', #{serverName}, '%')</if>
@@ -55,12 +55,12 @@
</where>
</select>
- <select id="selectArdServerManagementById" parameterType="String" resultMap="ArdServerManagementResult">
- <include refid="selectArdServerManagementVo"/>
+ <select id="selectArdServerInfoById" parameterType="String" resultMap="ArdServerInfoResult">
+ <include refid="selectArdServerInfoVo"/>
where c.id = #{id}
</select>
- <insert id="insertArdServerManagement" parameterType="ArdServerInfo">
+ <insert id="insertArdServerInfo" parameterType="ArdServerInfo">
insert into ard_server_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -94,7 +94,7 @@
</trim>
</insert>
- <update id="updateArdServerManagement" parameterType="ArdServerInfo">
+ <update id="updateArdServerInfo" parameterType="ArdServerInfo">
update ard_server_info
<trim prefix="SET" suffixOverrides=",">
<if test="serverName != null">server_name = #{serverName},</if>
@@ -113,11 +113,11 @@
where id = #{id}
</update>
- <delete id="deleteArdServerManagementById" parameterType="String">
+ <delete id="deleteArdServerInfoById" parameterType="String">
delete from ard_server_info where id = #{id}
</delete>
- <delete id="deleteArdServerManagementByIds" parameterType="String">
+ <delete id="deleteArdServerInfoByIds" parameterType="String">
delete from ard_server_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
--
Gitblit v1.9.3