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

流量统计详情app,协议，活跃IP增加地域查询条件

Browse Source
This commit is contained in:
zhanghongqing
2019-01-08 20:28:54 +08:00
parent f51120bd33
commit a705b00a15
8 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,9 +538,9 @@ public class DashboardService extends BaseService {
/**
* 获取活跃IPtop10 的趋势图
*/
public List<Map> ipActiveFiveMinute(Date beginDate, Date endDate) {
public List<Map> ipActiveFiveMinute(Date beginDate, Date endDate,Integer entranceId) {
List<Map> listMap = new ArrayList<Map>();
List<LinkedHashMap> ipListTop10 = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate);
List<LinkedHashMap> ipListTop10 = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate,entranceId);
if (ipListTop10 != null && ipListTop10.size() > 0) {
StringBuilder ipStr = new StringBuilder();
for (LinkedHashMap map : ipListTop10) {
@@ -561,7 +561,7 @@ public class DashboardService extends BaseService {
}
ArrayList<TrafficIpActiveStatistic> ipInfoList = trafficIpActiveStatisticDao
.ipActiveFiveMinute(ipStr.toString(), beginDate, endDate);
.ipActiveFiveMinute(ipStr.toString(), beginDate, endDate,entranceId);
// 存放每个IP，每个时间点的总数
Map<String, List> ipCountListMap = new HashMap<String, List>();
int index = 0;
@@ -629,18 +629,18 @@ public class DashboardService extends BaseService {
*
* @return
*/
public List<HashMap> ipActiveOneHour(Date beginDate, Date endDate) {
public List<HashMap> ipActiveOneHour(Date beginDate, Date endDate,Integer entranceId) {
// TrafficIpActiveStatistic maxStatTime = trafficIpActiveStatisticDao.getMaxStatTime();
ArrayList<HashMap> listMap = new ArrayList<HashMap>();
// if (maxStatTime != null && maxStatTime.getStatTime() != null) {
// Date statTime = maxStatTime.getStatTime();
ArrayList<LinkedHashMap> list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate);
ArrayList<LinkedHashMap> list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate,entranceId);
if (list != null && list.size() > 0) {
for (LinkedHashMap map : list) {
if (map.get("ipAddr") != null) {
String ipAddr = (String) map.get("ipAddr");
HashMap resMap = trafficIpActiveStatisticDao.ipActiveOneHour(ipAddr, beginDate, endDate);
HashMap resMap = trafficIpActiveStatisticDao.ipActiveOneHour(ipAddr, beginDate, endDate,entranceId);
if (resMap != null) {
listMap.add(resMap);
}
@@ -666,7 +666,7 @@ public class DashboardService extends BaseService {
ArrayList<LinkedHashMap> list = new ArrayList<>();
// if (maxStatTime != null && maxStatTime.getStatTime() != null) {
// Date statTime = maxStatTime.getStatTime();
list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate);
list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate,null);
if (list != null && list.size() > 0) {
for (LinkedHashMap map : list) {
if (map.get("ipAddr") != null) {
@@ -706,12 +706,12 @@ public class DashboardService extends BaseService {
*
* @return
*/
public List<Map> getProtocolList(String startTime, String endTime, Integer[] protoType) {
public List<Map> getProtocolList(String startTime, String endTime, Integer[] protoType,Integer entranceId) {
// TrafficProtocolStatistic maxStatTime = trafficProtocolStatisticDao.getMaxStatTime();
List<Map> list = new ArrayList<Map>();
// if (maxStatTime != null && maxStatTime.getStatTime() != null) {
// Date statTime = maxStatTime.getStatTime();
list = trafficProtocolStatisticDao.getProtocolList(startTime, endTime, protoType);
list = trafficProtocolStatisticDao.getProtocolList(startTime, endTime, protoType,entranceId);
// }
return list;
}
@@ -742,12 +742,12 @@ public class DashboardService extends BaseService {
*
* @return
*/
public List<Map> getAppList(String startTime, String endTime, Integer[] appType) {
public List<Map> getAppList(String startTime, String endTime, Integer[] appType,Integer entranceId) {
// TrafficAppStatistic maxStatTime = trafficAppStatisticDao.getMaxStatTime();
List<Map> list = new ArrayList<Map>();
// if (maxStatTime != null && maxStatTime.getStatTime() != null) {
// Date statTime = maxStatTime.getStatTime();
list = trafficAppStatisticDao.getAppList(startTime, endTime, appType);
list = trafficAppStatisticDao.getAppList(startTime, endTime, appType,entranceId);
// }
return list;
}