diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml index c7f9629..82354a2 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml @@ -599,20 +599,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ${tableName} a - INNER JOIN ( - SELECT - 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 - AND a.interface_name = b.parent_interface - where - (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.ipV4 = b.ipV4 + LEFT JOIN rm_network_interface b ON a.client_id = b.client_id + + and (b.bind_ip = 1 or b.bind_ip = 3) + and a.ipV4 IS NOT NULL + and a.ipV4 != '' + and NOT (a.total_in_speed = 0 and a.total_out_speed = 0) + and a.service_sn = #{serviceSn}