服务器注册接口、snmp采集工具优化、其他bug修复

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml

@@ -27,10 +27,11 @@
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="clientId"    column="client_id"    />
     </resultMap>
 
     <sql id="selectRmSwitchManagementVo">
-        select id, switch_type, switch_name, hardware_sn, snmp_address, snmp_port, online_status, heartbeat_count, heartbeat_interval, heartbeat_oid, snmp_version, up_time, read_write_permission, security_level, encryption_method, community_name, switch_user, switch_password, create_time, update_time, create_by, update_by from rm_switch_management
+        select id, switch_type, switch_name, hardware_sn, snmp_address, snmp_port, online_status, heartbeat_count, heartbeat_interval, heartbeat_oid, snmp_version, up_time, read_write_permission, security_level, encryption_method, community_name, switch_user, switch_password, create_time, update_time, create_by, update_by, client_id from rm_switch_management
     </sql>
 
     <select id="selectRmSwitchManagementList" parameterType="RmSwitchManagement" resultMap="RmSwitchManagementResult">
@@ -53,6 +54,7 @@
             <if test="communityName != null  and communityName != ''"> and community_name like concat('%', #{communityName}, '%')</if>
             <if test="switchUser != null  and switchUser != ''"> and switch_user = #{switchUser}</if>
             <if test="switchPassword != null  and switchPassword != ''"> and switch_password = #{switchPassword}</if>
+            <if test="clientId != null  and clientId != ''"> and client_id = #{clientId}</if>
         </where>
     </select>
 
@@ -85,6 +87,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="clientId != null">client_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="switchType != null">#{switchType},</if>
@@ -108,6 +111,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="clientId != null">#{clientId},</if>
         </trim>
     </insert>