From 9809ae673c294132210c5f3fec7ed9479d69dfe3 Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Fri, 30 Jan 2026 10:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=9695=E5=80=BC=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EpsInitialTrafficDataServiceImpl.java     | 21 +++++++++++--------
 .../mapper/system/AllInterfaceNameMapper.xml  |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java
index 353e4ab..a89d442 100644
--- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java
+++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java
@@ -394,6 +394,7 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
         snList.forEach(interfaceName -> {
             queryParam.setClientId(interfaceName.getClientId());
             try {
+
                 calculateChangedDeviceBandwidth(queryParam, dailyStartTime, dailyEndTime, calculationMode);
                 log.info("计算{}的95带宽值完成", interfaceName.getClientId());
             }catch (Exception e){
@@ -920,15 +921,17 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
                 .getNetNameByRecord(changeQuery);
         if(record != null){
             String name = record.getTrafficPort();
-            // 查询mac
-            AllInterfaceName allInterfaceName = new AllInterfaceName();
-            allInterfaceName.setClientId(queryParam.getClientId());
-            allInterfaceName.setInterfaceName(name);
-            allInterfaceName.setResourceType("1");
-            List<AllInterfaceName> allInterfaceNameList = allInterfaceNameMapper.selectByNames(allInterfaceName);
-            if(allInterfaceNameList != null && !allInterfaceNameList.isEmpty()){
-                AllInterfaceName interfaceName = allInterfaceNameList.get(0);
-                queryParam.setMac(interfaceName.getServerIp());
+            if(name != null){
+                // 查询mac
+                AllInterfaceName allInterfaceName = new AllInterfaceName();
+                allInterfaceName.setClientId(queryParam.getClientId());
+                allInterfaceName.setInterfaceName(name);
+                allInterfaceName.setResourceType("1");
+                List<AllInterfaceName> allInterfaceNameList = allInterfaceNameMapper.selectByNames(allInterfaceName);
+                if(allInterfaceNameList != null && !allInterfaceNameList.isEmpty()){
+                    AllInterfaceName interfaceName = allInterfaceNameList.get(0);
+                    queryParam.setMac(interfaceName.getServerIp());
+                }
             }
         }
         queryParam.setStartTime(dailyStartTime);
diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml
index cdf9b26..ee7105e 100644
--- a/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml
+++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml
@@ -169,6 +169,7 @@
             <if test="switchIp != null  and switchIp != ''"> and switch_ip = #{switchIp}</if>
             <if test="serverIp != null  and serverIp != ''"> and server_ip = #{serverIp}</if>
         </where>
+        order by create_time desc
     </select>
 
     <!-- 批量插入接口名称 -->