优化95值计算

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,6 +921,7 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
                 .getNetNameByRecord(changeQuery);
         if(record != null){
             String name = record.getTrafficPort();
+            if(name != null){
                 // 查询mac
                 AllInterfaceName allInterfaceName = new AllInterfaceName();
                 allInterfaceName.setClientId(queryParam.getClientId());
@@ -931,6 +933,7 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
                     queryParam.setMac(interfaceName.getServerIp());
                 }
             }
+        }
         queryParam.setStartTime(dailyStartTime);
         queryParam.setEndTime(dailyEndTime);
         List<EpsInitialTrafficData> dataList = query(queryParam);

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>
 
     <!-- 批量插入接口名称 -->