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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-09-26 17:44:31 +08:00
parent 135b66c6f5 06133582fd
commit e09a1dbfac
28 changed files with 260 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -79,6 +79,7 @@ public class InterceptController extends CommonController{
interceptCfgService.saveInterceptCfg(entity);
addMessage(redirectAttributes,"save_success");
} catch (Exception e) {
logger.error("save_failed", e);
addMessage(redirectAttributes,"save_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+entity.getFunctionId();

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

@@ -63,35 +63,41 @@ public class TrafficStatisticsInfoController extends BaseController {
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
list = (ArrayList) fromJsonList.get("data");
Random r = new Random();
Double rejectNum=r.nextDouble()*100+61351;
Double dropConnNum=r.nextDouble()*100+54271;
Double monitorNum=r.nextDouble()*100+54271;
Double loopConnNum=r.nextDouble()*100+54271;
Double rejectNum=0d;
Double dropConnNum=0d;
Double monitorNum=0d;
Double loopConnNum=0d;
Double inoctetsNum=0d;
Double outoctetsNum=0d;
Double bandwidth=0d;
if(list!=null&&list.size()>0){
Map map = (Map) list.get(0);
rejectNum = (Double) map.get("rejectNum") ;
monitorNum = (Double) map.get("monitorNum");
dropConnNum = (Double) map.get("dropConnNum");
loopConnNum = (Double) map.get("loopConnNum");
inoctetsNum = (Double) map.get("inoctets");
outoctetsNum = (Double) map.get("outoctets");
//单位换算 byte->bit/s
inoctetsNum=(inoctetsNum*8)/(5*60*60);
outoctetsNum=(outoctetsNum*8)/(5*60*60);
}
int newUniConn=r.nextInt(7666)+815036;
int liveConnNum=r.nextInt(852)+23621;
int bandwidth=r.nextInt(2567)+62150;
int c2sNum=r.nextInt(100);
bandwidth=inoctetsNum+outoctetsNum;
m.put("rejectNum", rejectNum);
m.put("monitorNum", monitorNum);
m.put("loopConnNum", loopConnNum);
m.put("dropConnNum", dropConnNum);
m.put("newUniConn", newUniConn);
m.put("liveConnNum", liveConnNum);
m.put("c2sNum", c2sNum);
m.put("bandwidth", bandwidth);
logger.info("活跃IP数据"+fromJsonList);
m.put("bandwidth", bandwidth);
m.put("inoctetsNum", inoctetsNum);
m.put("outoctetsNum", outoctetsNum);
logger.info("统计流量信息数据"+fromJsonList);
return m;
} catch (Exception e) {
e.printStackTrace();
logger.error("活跃IP错误"+e);
logger.error("统计流量信息数据错误"+e);
}
return m;
}