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

5分钟流量 逻辑bug修正

Browse Source
This commit is contained in:
doufenghu
2018-12-01 13:19:30 +06:00
parent 8e8b519167
commit 8263139b26
1 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

@@ -1,31 +1,14 @@
package com.nis.web.service.restful; package com.nis.web.service.restful;
import java.util.ArrayList; import com.beust.jcommander.internal.Maps;
import java.util.Date; import com.nis.domain.restful.dashboard.*;
import java.util.HashMap; import com.nis.web.dao.dashboard.*;
import java.util.LinkedHashMap; import com.nis.web.service.BaseService;
import java.util.List; import com.zdjizhi.utils.StringUtil;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.nis.domain.Page; import java.util.*;
import com.nis.domain.restful.dashboard.NtcTotalReport;
import com.nis.domain.restful.dashboard.TrafficAppStatistic;
import com.nis.domain.restful.dashboard.TrafficHttpStatistic;
import com.nis.domain.restful.dashboard.TrafficIpActiveStatistic;
import com.nis.domain.restful.dashboard.TrafficPortActiveStatistic;
import com.nis.domain.restful.dashboard.TrafficProtocolStatistic;
import com.nis.domain.restful.dashboard.TrafficUaStatistic;
import com.nis.web.dao.dashboard.NtcTotalReportDao;
import com.nis.web.dao.dashboard.TrafficAppStatisticDao;
import com.nis.web.dao.dashboard.TrafficHttpStatisticDao;
import com.nis.web.dao.dashboard.TrafficIpActiveStatisticDao;
import com.nis.web.dao.dashboard.TrafficPortActiveStatisticDao;
import com.nis.web.dao.dashboard.TrafficProtocolStatisticDao;
import com.nis.web.dao.dashboard.TrafficUaStatisticDao;
import com.nis.web.service.BaseService;
@Service @Service
public class DashboardService extends BaseService{ public class DashboardService extends BaseService{
@@ -57,34 +40,33 @@ public class DashboardService extends BaseService{
totalReportList = ntcTotalReportDao.getTotalReportList(reportTime); totalReportList = ntcTotalReportDao.getTotalReportList(reportTime);
} }
Map maxRecvtTime = ntcTotalReportDao.getMaxRecvTime(); Map maxRecvtTime = ntcTotalReportDao.getMaxRecvTime();
List<Map> newData = new ArrayList<Map>(); List<Map> newData = new ArrayList<Map>();
// List<Map> oldData = new ArrayList<Map>();
if(maxRecvtTime!=null&&maxRecvtTime.get("statTime")!=null) { if(maxRecvtTime!=null && maxRecvtTime.get("statTime")!=null) {
Date recvTime = (Date) maxRecvtTime.get("statTime"); Date recvTime = (Date) maxRecvtTime.get("statTime");
newData = ntcTotalReportDao.getNetFlowPortInfoNew(recvTime); newData = ntcTotalReportDao.getNetFlowPortInfoNew(recvTime);
// oldData = ntcTotalReportDao.getNetFlowPortInfoOld(recvTime);
} }
//统计带宽的流入流出 单位 五分钟 的 byte //统计带宽的流入流出 单位 五分钟 的 byte
Double inoctets=0d; if(StringUtil.isNotEmpty(newData)){
Double outoctets=0d; Double inoctets = Double.parseDouble(newData.get(0).get("inoctets").toString()) ;
if(newData!=null&&newData.size()>0&&newData.get(0)!=null){ Double outoctets = Double.parseDouble(newData.get(0).get("outoctets").toString()) ;
Double newInoctets=Double.parseDouble(newData.get(0).get("inoctets").toString()) ;
Double newOutoctets=Double.parseDouble(newData.get(0).get("outoctets").toString()) ; if (StringUtil.isEmpty(totalReportList)) {
//结果为当前五分钟减去上个五分钟 Map valueMap = Maps.newHashMap();
inoctets=newInoctets; valueMap.put("inoctets", inoctets);
outoctets=newOutoctets; valueMap.put("outoctets", outoctets);
if(inoctets<0||outoctets<0){ totalReportList.add(valueMap);
inoctets=0d; } else {
outoctets=0d; totalReportList.get(0).put("inoctets", inoctets);
} totalReportList.get(0).put("outoctets", outoctets);
}
if(totalReportList!=null&&totalReportList.size()>0){
for (Map map : totalReportList) {
map.put("inoctets", inoctets);
map.put("outoctets", outoctets);
} }
} }
return totalReportList; return totalReportList;
} }
/** /**