单网卡总流量、ipv4流量、ipv6流量合并到一个图

pppoe状态上报增加
2025-12-30 18:23:09 +08:00
parent 6e2ca8ac53
commit 08680bb46a
20 changed files with 298 additions and 58 deletions
@@ -314,17 +314,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        AND d.create_time = latest.latest_time
    </select>
    <select id="getMemUtil" resultType="RmResourceRegistration">
-        select
+        SELECT
        d.client_id as clientId,
-        max(CASE WHEN d.collect_type = 'memorySizeTotalCollect' THEN floor(d.collect_value/(1024 * 1024)) END) as memTotalSize,
-        max(CASE WHEN d.collect_type = 'memoryUtilizationCollect' THEN ROUND(d.collect_value, 1) END) as memUtil
+        ROUND(d.collect_value, 1) as memUtil
        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='memoryUtilizationCollect' or collect_type='memorySizeTotalCollect')
+        WHERE collect_type='memoryUtilizationCollect'
        AND client_id in
        <foreach collection="clientIdsStr.split(',')" item="clientId" open="(" separator="," close=")">
            #{clientId}
@@ -332,7 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        GROUP BY client_id
        ) latest ON d.client_id = latest.client_id
        AND d.create_time = latest.max_time
-        AND (d.collect_type='memoryUtilizationCollect' or d.collect_type='memorySizeTotalCollect')
+        AND d.collect_type='memoryUtilizationCollect'
    </select>
    <update id="removeAlarmFlag" parameterType="RmResourceRegistration">
        update rm_resource_registration set del_alarm_time = now()