gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'debug-26-流量统计bug' into 'develop'

Browse Source 
修复流量B和b换算问题

See merge request K18_NTCS_WEB/NTC!12
This commit is contained in:
董晓燕
2019-01-23 18:16:53 +08:00
parent 44a8e8852e 3cd969978e
commit 65991514d7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/dashboard/DashboardController.java
View File

@@ -268,7 +268,7 @@ public class DashboardController extends BaseController{
//两个时间段之间的秒数 //两个时间段之间的秒数
double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate)); double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
for(TrafficIpActiveStatistic data:list) { for(TrafficIpActiveStatistic data:list) {
data.setAvgByte(f.format(Long.parseLong(data.get_byte())/1024/1024/1024/allSeconds)); data.setAvgByte(f.format(Long.parseLong(data.get_byte())*8/1024/1024/1024/allSeconds));
data.setAvgPacket(lf.format(Long.parseLong(data.get_packet())/allSeconds)); data.setAvgPacket(lf.format(Long.parseLong(data.get_packet())/allSeconds));
} }
} }

10
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -352,7 +352,7 @@ public class TrafficStatisticsInfoController extends BaseController {
m.put("linkNum", lf.format(m.get("linkNum"))); m.put("linkNum", lf.format(m.get("linkNum")));
double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
m.put("pps",lf.format(avgPacket)); m.put("pps",lf.format(avgPacket));
double avgByte=Double.parseDouble(m.get("GByte").toString())/allSeconds; double avgByte=Double.parseDouble(m.get("GByte").toString())*8/allSeconds;
m.put("bps",f.format(avgByte)); m.put("bps",f.format(avgByte));
totalLink+=Long.parseLong( m.get("linkNum").toString()); totalLink+=Long.parseLong( m.get("linkNum").toString());
totalPackets+=Long.parseLong(m.get("packets").toString()); totalPackets+=Long.parseLong(m.get("packets").toString());
@@ -442,7 +442,7 @@ public class TrafficStatisticsInfoController extends BaseController {
double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
m.put("pps",lf.format(avgPacket)); m.put("pps",lf.format(avgPacket));
double avgByte=Double.parseDouble(m.get("GByte").toString())/allSeconds; double avgByte=Double.parseDouble(m.get("GByte").toString())*8/allSeconds;
m.put("bps",f.format(avgByte)); m.put("bps",f.format(avgByte));
} }
for (Object object : list) { for (Object object : list) {
@@ -553,7 +553,7 @@ public class TrafficStatisticsInfoController extends BaseController {
for(Map m:list) { for(Map m:list) {
double avgPacket=Double.parseDouble(m.get("pktNum").toString())/allSeconds; double avgPacket=Double.parseDouble(m.get("pktNum").toString())/allSeconds;
m.put("pps",dl.format(avgPacket)); m.put("pps",dl.format(avgPacket));
double avgByte=Double.parseDouble(m.get("byteNum").toString())/1024/1024/1024/allSeconds; double avgByte=Double.parseDouble(m.get("byteNum").toString())*8/1024/1024/1024/allSeconds;
m.put("bps",f.format(avgByte)); m.put("bps",f.format(avgByte));
} }
} }
@@ -673,7 +673,7 @@ public class TrafficStatisticsInfoController extends BaseController {
double avgPacket=Double.parseDouble(m.get("pktCount").toString())/allSeconds; double avgPacket=Double.parseDouble(m.get("pktCount").toString())/allSeconds;
m.put("pps",dl.format(avgPacket)); m.put("pps",dl.format(avgPacket));
double avgByte=Double.parseDouble(m.get("byteCount").toString())/1024/1024/1024/allSeconds; double avgByte=Double.parseDouble(m.get("byteCount").toString())*8/1024/1024/1024/allSeconds;
m.put("bps",f.format(avgByte)); m.put("bps",f.format(avgByte));
} }
List<WebsiteDomainTopic> codeList = appCfgService.getDomainDict(new WebsiteDomainTopic()); List<WebsiteDomainTopic> codeList = appCfgService.getDomainDict(new WebsiteDomainTopic());
@@ -756,7 +756,7 @@ public class TrafficStatisticsInfoController extends BaseController {
totalGByte+=Double.parseDouble(lf.format(m.get("count"))); totalGByte+=Double.parseDouble(lf.format(m.get("count")));
double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds; double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
m.put("pps",lf.format(avgPacket)); m.put("pps",lf.format(avgPacket));
double avgByte=Double.parseDouble(m.get("count").toString())/1024/1024/1024/allSeconds; double avgByte=Double.parseDouble(m.get("count").toString())*8/1024/1024/1024/allSeconds;
m.put("bps",f.format(avgByte)); m.put("bps",f.format(avgByte));
m.remove("domainData"); m.remove("domainData");
Double value1=0d; Double value1=0d;