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

HTTP(S)操控日志app_id,app_protocol,protocol_id直接取值，去掉字典转换

Browse Source 
实时报表-国家代理统计菜单及它下面的子菜单都置为失效
This commit is contained in:
shangguanyanfei
2019-06-10 16:22:03 +08:00
parent 194bf20558
commit 21cd6c06be
4 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,13 +137,13 @@ public class PxyHttpManipulationLog extends BaseEntity<PxyHttpManipulationLog>{
protected String san;
@ExcelField(title="cn",sort=85)
protected String cn;
// @ExcelField(title="social_app",sort=86)
protected String appId;//app
@ExcelField(title="social_app",sort=86)
protected String appId;//app
// @ExcelField(title="social_app",sort=86)
protected String appName;//app
// @ExcelField(title="protocol",sort=87)
protected String protocolId;//协议
@ExcelField(title="protocol",sort=87)
protected String protocolId;//协议
// @ExcelField(title="protocol",sort=87)
protected String protocolName;//协议
@ExcelField(title="con_latency_ms",sort=88)
protected Integer conLatencyMs;//握手延迟

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

@@ -53,8 +53,8 @@ public class PxyHttpManipulLogController extends BaseController{
public String list(@ModelAttribute("log") PxyHttpManipulationLog log, Model model, HttpServletRequest request,
HttpServletResponse response,Integer searchAction) {
try {
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
// 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());
@@ -79,18 +79,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());
}
// 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);
// model.addAttribute("appList", appCodeList);
// model.addAttribute("protocolList", protocolCodeList);
String url = Constants.LOG_BASE_URL + Constants.POLICY_EVENT;
String recv = HttpClientUtil.getMsg(url, params, request);
@@ -111,7 +111,7 @@ public class PxyHttpManipulLogController extends BaseController{
l.setStartTime(timeStamp2Date(l.getStartTime(),null));
l.setEndTime(timeStamp2Date(l.getEndTime(),null));
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
for (CodeResult code : appCodeList) {
/*for (CodeResult code : appCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
l.setAppName(code.getItem());
@@ -124,7 +124,7 @@ public class PxyHttpManipulLogController extends BaseController{
l.setProtocolName(code.getItem());
break;
}
}
}*/
}
}
@@ -148,8 +148,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");
// 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);
@@ -171,12 +171,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());
}
// 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);
@@ -199,20 +199,20 @@ public class PxyHttpManipulLogController extends BaseController{
l.setStartTime(timeStamp2Date(l.getStartTime(),null));
l.setEndTime(timeStamp2Date(l.getEndTime(),null));
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
for (CodeResult code : appCodeList) {
Integer value3 = Integer.valueOf(code.getCode());
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(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
l.setProtocolName(code.getItem());
break;
}
}
// for (CodeResult code : appCodeList) {
// Integer value3 = Integer.valueOf(code.getCode());
// 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(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
// l.setProtocolName(code.getItem());
// break;
// }
// }
}
String title="";
if(log.getAction().equals(1)){//监测