优化网卡名称变更处理

增加非saas平台拨号数据处理
优化详情信息

tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml

@@ -48,6 +48,7 @@
             <if test="serverIp != null  and serverIp != ''"> and server_ip = #{serverIp}</if>
             <if test="portStatus != null  and portStatus != ''"> and port_status = #{portStatus}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectAllInterfaceNameById" parameterType="Long" resultMap="AllInterfaceNameResult">
@@ -156,7 +157,7 @@
         all_interface_name
         <where>
             <if test="clientId != null  and clientId != ''"> and client_id = #{clientId}</if>
-            <if test="interfaceName != null  and interfaceName != ''"> and interface_name = #{interfaceName}</if>
+            <if test="interfaceName != null  and interfaceName != ''"> and interface_name like concat(#{interfaceName},'%')</if>
             <if test="deviceSn != null  and deviceSn != ''"> and device_sn = #{deviceSn}</if>
             <if test="nodeName != null  and nodeName != ''"> and node_name = #{nodeName}</if>
             <if test="businessCode != null  and businessCode != ''"> and business_code = #{businessCode}</if>

tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml

@@ -387,9 +387,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.client_id AS clientId,
         a.ipV6 AS ipV6
         FROM ${tableName} a
-        INNER JOIN rm_network_interface b ON a.client_id = b.client_id and a.mac=b.mac_address
-        AND (b.bind_ip = 1 OR b.bind_ip = 3)
-        AND b.new_flag = 1
+        <!-- 动态关联表 -->
+        <if test="mac == null or mac == ''">
+            INNER JOIN rm_network_interface b ON a.client_id = b.client_id and a.mac = b.mac_address
+            AND (b.bind_ip = 1 OR b.bind_ip = 3)
+            AND b.new_flag = 1
+        </if>
         <where>
             <if test="serviceSn != '' and serviceSn != null">
                 and a.service_sn = #{serviceSn}
@@ -409,6 +412,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="revenueMethod != null">
                 and a.revenue_method = #{revenueMethod}
             </if>
+            <if test="mac != null and mac != ''">
+                and a.mac = #{mac}
+            </if>
         </where>
         GROUP BY a.create_time DESC
     </select>