liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Your Name
2026-08-07 14:34:13 +08:00
parent 92571fed91
commit afdeb7116d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
+2 -2
View File
@@ -601,7 +601,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mac == null or mac == ''"> <if test="mac == null or mac == ''">
INNER JOIN ( INNER JOIN (
SELECT 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 FROM rm_network_interface a
LEFT JOIN rm_network_interface_child b on b.ipv4_address!='' and b.ipv4_address!='N/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 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) (a.bind_ip = 1 OR a.bind_ip = 3)
AND a.new_flag = 1 and a.client_id = #{clientId} AND a.new_flag = 1 and a.client_id = #{clientId}
) b ) 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> </if>
<where> <where>
<if test="serviceSn != '' and serviceSn != null"> <if test="serviceSn != '' and serviceSn != null">