优化服务器列表查询速度、筛选条件bug修复。

ipv4、ipv6初始流量处理。
增加日志排查收益未自动生成问题。
This commit is contained in:
gaoyutao
2025-12-10 18:32:07 +08:00
parent 13e51c11e1
commit 2eaf62ea82
12 changed files with 299 additions and 298 deletions
@@ -282,6 +282,13 @@ public class MessageHandler {
iface.setTotalIpv4InSpeed(dataProcessUtil.bytesToBits(iface.getIpv4InSpeed()));
iface.setTotalIpv6OutSpeed(dataProcessUtil.bytesToBits(iface.getIpv6OutSpeed()));
iface.setTotalIpv6InSpeed(dataProcessUtil.bytesToBits(iface.getIpv6InSpeed()));
// 首次采集,速率设为null
iface.setInSpeed(null);
iface.setOutSpeed(null);
iface.setIpv4InSpeed(null);
iface.setIpv4OutSpeed(null);
iface.setIpv6InSpeed(null);
iface.setIpv6OutSpeed(null);
InitialBandwidthTrafficTemp tempInfo = tempMap.get(iface.getMac());
if (tempInfo != null) {
@@ -292,8 +299,6 @@ public class MessageHandler {
BigDecimal inDiff = nowInSpeed.subtract(tempInSpeed);
if (inDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setInSpeed(inDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setInSpeed(null);
}
}
// 计算总流出速率
@@ -303,8 +308,6 @@ public class MessageHandler {
BigDecimal outDiff = nowOutSpeed.subtract(tempOutSpeed);
if (outDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setOutSpeed(outDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setOutSpeed(null);
}
}
// 计算IPv4流入速率
@@ -314,8 +317,6 @@ public class MessageHandler {
BigDecimal ipv4InDiff = nowIpv4In.subtract(tempIpv4In);
if (ipv4InDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setIpv4InSpeed(ipv4InDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setIpv4InSpeed(null);
}
}
// 计算IPv4流出速率
@@ -325,8 +326,6 @@ public class MessageHandler {
BigDecimal ipv4OutDiff = nowIpv4Out.subtract(tempIpv4Out);
if (ipv4OutDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setIpv4OutSpeed(ipv4OutDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setIpv4OutSpeed(null);
}
}
// 计算IPv6流入速率
@@ -336,8 +335,6 @@ public class MessageHandler {
BigDecimal ipv6InDiff = nowIpv6In.subtract(tempIpv6In);
if (ipv6InDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setIpv6InSpeed(ipv6InDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setIpv6InSpeed(null);
}
}
// 计算IPv6流出速率
@@ -347,8 +344,6 @@ public class MessageHandler {
BigDecimal ipv6OutDiff = nowIpv6Out.subtract(tempIpv6Out);
if (ipv6OutDiff.compareTo(BigDecimal.ZERO) >= 0) {
iface.setIpv6OutSpeed(ipv6OutDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString());
} else {
iface.setIpv6OutSpeed(null);
}
}
}