From 14a155d1da646b080ce0f30db0e38ba17b7dd95a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 17:15:53 +0800
Subject: [PATCH] 1.增加根据[服务器id]获取六合盒子列表接口。 2.服务器管增加服务器状态。 3.服务器管理增加根据部门权限筛选。
---
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index b5ea34b..4bd8f5e 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -17,35 +17,47 @@
<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
+ 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="ArdServerInfo" resultMap="ArdServerManagementResult">
<include refid="selectArdServerManagementVo"/>
- <where>
- <if test="serverName != null and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if>
- <if test="host != null and host != ''"> and host = #{host}</if>
+ <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}
+ where c.id = #{id}
</select>
<insert id="insertArdServerManagement" parameterType="ArdServerInfo">
@@ -63,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>
@@ -77,6 +90,7 @@
<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>
@@ -94,6 +108,7 @@
<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>
--
Gitblit v1.9.3