From 2a729cd545ddbbab1eae6cbcf819783ef11da4ab Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 24 Nov 2025 09:56:07 +0800
Subject: [PATCH] 增加格式化存储卡接口

---
 ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index dbdceda..ae58db9 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,9 +17,10 @@
         <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">
+    <sql id="selectArdServerInfoVoNo">
         select id,
                server_name,
                host,
@@ -31,24 +32,53 @@
                latitude,
                altitude,
                user_id,
-               dept_id
-        from ard_server_info
+               dept_id,
+               server_status
+        from ard_server
     </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>
+    <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 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="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 c.server_name like 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 into ard_server_info
+    <insert id="insertArdServerInfo" parameterType="ArdServerInfo">
+        insert into ard_server
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="serverName != null">server_name,</if>
@@ -62,6 +92,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,11 +107,12 @@
             <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 ard_server_info
+    <update id="updateArdServerInfo" parameterType="ArdServerInfo">
+        update ard_server
         <trim prefix="SET" suffixOverrides=",">
             <if test="serverName != null">server_name = #{serverName},</if>
             <if test="host != null">host = #{host},</if>
@@ -93,18 +125,33 @@
             <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 from ard_server_info where id = #{id}
+    <update id="updateServerStatus">
+        update ard_server
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null">server_status = #{status},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteArdServerInfoById" parameterType="String">
+        delete from ard_server where id = #{id}
     </delete>
 
-    <delete id="deleteArdServerManagementByIds" parameterType="String">
-        delete from ard_server_info where id in
+    <delete id="deleteArdServerInfoByIds" parameterType="String">
+        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>
\ No newline at end of file

--
Gitblit v1.9.3