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

1.统计-带宽两个图的合并2.HTTP(S)操控日志页面增加查询条件及Custom列表展示列选择页面增加滚动条

Browse Source
This commit is contained in:
shangguanyanfei
2019-06-05 14:14:40 +08:00
parent c83472c508
commit db7049c041
7 changed files with 346 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java
View File

@@ -138,11 +138,11 @@ public class PxyHttpManipulationLog extends BaseEntity<PxyHttpManipulationLog>{
@ExcelField(title="cn",sort=85)
protected String cn;
// @ExcelField(title="social_app",sort=86)
protected Integer appId;//app
protected String appId;//app
@ExcelField(title="social_app",sort=86)
protected String appName;//app
// @ExcelField(title="protocol",sort=87)
protected Integer protocolId;//协议
protected String protocolId;//协议
@ExcelField(title="protocol",sort=87)
protected String protocolName;//协议
@ExcelField(title="con_latency_ms",sort=88)
@@ -436,16 +436,16 @@ public class PxyHttpManipulationLog extends BaseEntity<PxyHttpManipulationLog>{
public void setCn(String cn) {
this.cn = cn;
}
public Integer getAppId() {
public String getAppId() {
return appId;
}
public void setAppId(Integer appId) {
public void setAppId(String appId) {
this.appId = appId;
}
public Integer getProtocolId() {
public String getProtocolId() {
return protocolId;
}
public void setProtocolId(Integer protocolId) {
public void setProtocolId(String protocolId) {
this.protocolId = protocolId;
}
public Integer getConLatencyMs() {

5
src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
View File

@@ -95,7 +95,7 @@ public class ConfigStatisticsController extends BaseController {
@RequestMapping(value="bandWidthTransThreeNew")
@ResponseBody
public Map bandWidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,
String timeSize,Integer [] operator,Model model,HttpServletRequest request){
String timeSize,Integer [] operator,String searchEntranceId,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_THREE_NEW;
@@ -109,6 +109,9 @@ public class ConfigStatisticsController extends BaseController {
if(!StringUtil.isEmpty(timeSize)) {
url=url+"&searchBusinessType="+timeSize;
}
if(!StringUtil.isEmpty(searchEntranceId)) {
url=url+"&entranceId="+searchEntranceId;
}
if(operator!=null){
for (Integer oper : operator) {
if(oper!=null){

60
src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java
View File

@@ -53,7 +53,8 @@ public class PxyHttpManipulLogController extends BaseController{
public String list(@ModelAttribute("log") PxyHttpManipulationLog log, Model model, HttpServletRequest request,
HttpServletResponse response) {
try {
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
PageLog<PxyHttpManipulationLog> page = new PageLog<PxyHttpManipulationLog>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize());
@@ -75,10 +76,18 @@ public class PxyHttpManipulLogController extends BaseController{
if(log.getCfgId()!=null && log.getPolicyId() ==null){
log.setPolicyId(log.getCfgId());
}
if (StringUtils.isNotBlank(log.getAppId())) {
params.put("searchAppId", log.getAppId());
}
if (StringUtils.isNotBlank(log.getProtocolId())) {
params.put("searchProtocolId", log.getProtocolId());
}
initLogSearchValues(log, params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
model.addAttribute("appList", appCodeList);
model.addAttribute("protocolList", protocolCodeList);
String url = Constants.LOG_BASE_URL + Constants.POLICY_EVENT;
String recv = HttpClientUtil.getMsg(url, params, request);
@@ -92,8 +101,7 @@ public class PxyHttpManipulLogController extends BaseController{
page.setLast(data.getLast());
page.setList(data.getList());
List<PxyHttpManipulationLog> list = page.getList();
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
for (PxyHttpManipulationLog l : list) {
l.setFunctionId(log.getFunctionId());
// setLogAction(l, serviceList);
@@ -102,14 +110,14 @@ public class PxyHttpManipulLogController extends BaseController{
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
for (CodeResult code : appCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
if(l.getAppId() !=null && l.getAppId().equals(value3)){
if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
l.setAppName(code.getItem());
break;
}
}
for (CodeResult code : protocolCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
if(l.getProtocolId() !=null && l.getProtocolId().equals(value3)){
if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
l.setProtocolName(code.getItem());
break;
}
@@ -137,6 +145,8 @@ public class PxyHttpManipulLogController extends BaseController{
Map<String, List> dataMap = new HashMap<String, List>();
Map<String, String> noExportMap = new HashMap<String, String>();
// ---------------------------
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
PageLog<PxyHttpManipulationLog> page = new PageLog<PxyHttpManipulationLog>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
@@ -158,6 +168,12 @@ public class PxyHttpManipulLogController extends BaseController{
String domain = StringEscapeUtils.unescapeHtml(log.getDomain());
params.put("searchDomain", domain);
}
if (StringUtils.isNotBlank(log.getAppId())) {
params.put("searchAppId", log.getAppId());
}
if (StringUtils.isNotBlank(log.getProtocolId())) {
params.put("searchProtocolId", log.getProtocolId());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
@@ -174,8 +190,7 @@ public class PxyHttpManipulLogController extends BaseController{
list = data.getList();
}
}
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
for (PxyHttpManipulationLog l : list) {
l.setFunctionId(log.getFunctionId());
l.setStartTime(timeStamp2Date(l.getStartTime(),null));
@@ -183,14 +198,14 @@ public class PxyHttpManipulLogController extends BaseController{
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
for (CodeResult code : appCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
if(l.getAppId() !=null && l.getAppId().equals(value3)){
if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
l.setAppName(code.getItem());
break;
}
}
for (CodeResult code : protocolCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
if(l.getProtocolId() !=null && l.getProtocolId().equals(value3)){
if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
l.setProtocolName(code.getItem());
break;
}
@@ -289,6 +304,33 @@ public class PxyHttpManipulLogController extends BaseController{
if (entry.getPolicyId() != null) {
params.put("searchPolicyId", entry.getPolicyId());
}
/*if (entry.getAction() != null) {
params.put("searchAction", entry.getAction());
}*/
if (entry.getAddrType() != null) {
params.put("searchAddrType", entry.getAddrType());
}
if (StringUtils.isNotBlank(entry.getIsp())) {
params.put("searchIsp", entry.getIsp());
}
if (StringUtils.isNotBlank(entry.getServerLocation())) {
params.put("searchServerLocation", entry.getServerLocation());
}
if (StringUtils.isNotBlank(entry.getClientLocation())) {
params.put("searchClientLocation", entry.getClientLocation());
}
if (StringUtils.isNotBlank(entry.getHost())) {
params.put("searchHost", entry.getHost());
}
if (StringUtils.isNotBlank(entry.getSni())) {
params.put("searchSni", entry.getSni());
}
if (StringUtils.isNotBlank(entry.getSan())) {
params.put("searchSan", entry.getSan());
}
if (StringUtils.isNotBlank(entry.getCn())) {
params.put("searchCn", entry.getCn());
}
if (StringUtils.isNotBlank(entry.getOrderBy())) {
params.put("orderBy", entry.getOrderBy());
}