流量数据的关联由mac改成ip 因为mac是虚拟的重启后会变不稳定

2026-08-07 14:34:13 +08:00
parent 92571fed91
commit afdeb7116d
1 changed files with 2 additions and 2 deletions
@@ -601,7 +601,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="mac == null or mac == ''">
            INNER JOIN  (
            SELECT
-            a.client_id,ifnull(b.mac_address,a.mac_address) mac_address
+            a.client_id,ifnull(b.mac_address,a.mac_address) mac_address,b.ipv4_address ipV4
            FROM rm_network_interface a
            LEFT JOIN rm_network_interface_child b on b.ipv4_address!='' and b.ipv4_address!='N/A'
            and a.client_id = b.client_id
@@ -610,7 +610,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            (a.bind_ip = 1 OR a.bind_ip = 3)
            AND a.new_flag = 1 and a.client_id = #{clientId}
            ) b
-            ON a.client_id = b.client_id and a.mac = b.mac_address
+            ON a.client_id = b.client_id and a.ipV4 = b.ipV4
        </if>
        <where>
            <if test="serviceSn != '' and serviceSn != null">