From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index dbdceda..a162d73 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.work.mapper.ArdServerInfoMapper">
- <resultMap type="ArdServerInfo" id="ArdServerManagementResult">
+ <resultMap type="ArdServerInfo" id="ArdServerInfoResult">
<result property="id" column="id" />
<result property="serverName" column="server_name" />
<result property="host" column="host" />
@@ -17,37 +17,50 @@
<result property="altitude" column="altitude" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
+ <result property="serverStatus" column="server_status" />
</resultMap>
- <sql id="selectArdServerManagementVo">
- select id,
- server_name,
- host,
- tcp_port,
- http_port,
- access_key_id,
- access_key_secret,
- longitude,
- latitude,
- altitude,
- user_id,
- dept_id
- from ard_server_info
+ <sql id="selectArdServerInfoVo">
+ select c.id,
+ c.server_name,
+ c.host,
+ c.tcp_port,
+ c.http_port,
+ c.access_key_id,
+ c.access_key_secret,
+ c.longitude,
+ c.latitude,
+ c.altitude,
+ c.user_id,
+ c.dept_id,
+ c.server_status
+ from ard_server_info 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>
- <select id="selectArdServerManagementList" parameterType="ArdServerManagement" resultMap="ArdServerManagementResult">
- <include refid="selectArdServerManagementVo"/>
- <where>
- <if test="serverName != null and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if>
+ <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>
+ <if test="accessKeyId != null and accessKeyId != ''"> and c.access_key_id = #{accessKeyId}</if>
+ <if test="accessKeySecret != null and accessKeySecret != ''"> and c.access_key_secret = #{accessKeySecret}</if>
+ <if test="serverStatus != null and serverStatus != ''"> and c.server_status = #{serverStatus}</if>
+ <if test="deptId != null and deptId != 0">
+ AND (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+ </if>
+ <!-- 数据范围过滤 -->
+ ${params.dataScope}
</where>
</select>
- <select id="selectArdServerManagementById" parameterType="String" resultMap="ArdServerManagementResult">
- <include refid="selectArdServerManagementVo"/>
- where id = #{id}
+ <select id="selectArdServerInfoById" parameterType="String" resultMap="ArdServerInfoResult">
+ <include refid="selectArdServerInfoVo"/>
+ where c.id = #{id}
</select>
- <insert id="insertArdServerManagement" parameterType="ArdServerManagement">
+ <insert id="insertArdServerInfo" parameterType="ArdServerInfo">
insert into ard_server_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -62,6 +75,7 @@
<if test="altitude != null">altitude,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
+ <if test="serverStatus != null">server_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -76,10 +90,11 @@
<if test="altitude != null">#{altitude},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
+ <if test="serverStatus != null">#{serverStatus},</if>
</trim>
</insert>
- <update id="updateArdServerManagement" parameterType="ArdServerManagement">
+ <update id="updateArdServerInfo" parameterType="ArdServerInfo">
update ard_server_info
<trim prefix="SET" suffixOverrides=",">
<if test="serverName != null">server_name = #{serverName},</if>
@@ -93,15 +108,16 @@
<if test="altitude != null">altitude = #{altitude},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="serverStatus != null">server_status = #{serverStatus},</if>
</trim>
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