开发庭与科技详情相关接口。

优化PppoE查询接口。
2025-12-31 17:59:33 +08:00
parent 08680bb46a
commit 4651da4fe4
23 changed files with 200 additions and 33 deletions
@@ -91,6 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            MAX(CASE WHEN t.collect_type = 'systemBoottimeCollect' THEN t.collect_value END) as systemBoottimeCollect,
            MAX(CASE WHEN t.collect_type = 'systemUnameCollect' THEN t.collect_value END) as systemUnameCollect,
            MAX(CASE WHEN t.collect_type = 'systemLocaltimeCollect' THEN t.collect_value END) as systemLocaltimeCollect,
+            MAX(CASE WHEN t.collect_type = 'procNumRunCollect' THEN t.collect_value END) as procNumRunCollect,
+            MAX(CASE WHEN t.collect_type = 'systemUsersNumCollect' THEN t.collect_value END) as systemUsersNumCollect,
+            MAX(CASE WHEN t.collect_type = 'systemSwapSizeFreeCollect' THEN t.collect_value END) as systemSwapSizeFreeCollect,
+            MAX(CASE WHEN t.collect_type = 'systemSwapSizePercentCollect' THEN t.collect_value END) as systemSwapSizePercentCollect,
+            MAX(CASE WHEN t.collect_type = 'memorySizeAvailableCollect' THEN t.collect_value END) as memorySizeAvailableCollect,
+            MAX(CASE WHEN t.collect_type = 'memorySizePercentCollect' THEN t.collect_value END) as memorySizePercentCollect,
            MAX(CASE WHEN t.collect_type = 'systemUptimeCollect' THEN t.collect_value END) as systemUptimeCollect
        FROM `initial_system_other_collect_data` t
                 INNER JOIN (
@@ -117,4 +123,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            </choose>
        </where>
    </delete>
+    <select id="getMemTotalSize" parameterType="String" resultType="String">
+        select
+        floor(d.collect_value/(1024 * 1024))  as memTotalSize
+        FROM initial_system_other_collect_data d
+        INNER JOIN (
+        SELECT
+        client_id,
+        MAX(create_time) as max_time
+        FROM initial_system_other_collect_data
+        WHERE collect_type='memorySizeTotalCollect'
+        AND client_id = #{clientId}
+        GROUP BY client_id
+        ) latest ON d.client_id = latest.client_id
+        AND d.create_time = latest.max_time
+        AND d.collect_type='memorySizeTotalCollect'
+    </select>
 </mapper>
@@ -162,4 +162,18 @@
        </trim>
        where mac_address = #{macAddress} and client_id = #{clientId}
    </update>
+    <update id="updateNetMsgByMac" parameterType="RmNetworkInterface">
+        update rm_network_interface
+        set
+            isp = #{isp},
+            province = #{province},
+            city = #{city},
+            public_ip = #{publicIp},
+            interface_name = #{interfaceName},
+            interface_type = #{interfaceType},
+            ipv4_address = #{ipv4Address},
+            ipv6_address = #{ipv6Address},
+            update_time = #{updateTime}
+        where mac_address = #{macAddress} and client_id = #{clientId}
+    </update>
 </mapper>
@@ -34,7 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectRmPppoeConfigMainVo"/>
        where id = #{id}
    </select>
-
+    <select id="selectRmPppoeConfigMainByClientId" parameterType="RmPppoeConfigMain" resultMap="RmPppoeConfigMainResult">
+        <include refid="selectRmPppoeConfigMainVo"/>
+        where client_id = #{clientId}
+    </select>
    <insert id="insertRmPppoeConfigMain" parameterType="RmPppoeConfigMain" useGeneratedKeys="true" keyProperty="id">
        insert into rm_pppoe_config_main
        <trim prefix="(" suffix=")" suffixOverrides=",">