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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
tanghao
2018-12-29 18:34:22 +08:00
parent 7d888aeb1b 7ec4ec12e5
commit ecefa007e1
69 changed files with 2608 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -77,7 +77,8 @@ public class TaskInfoController extends BaseController{
}else{
if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
logger.info(taskInfo.getTaskName()+"重复数据");
addMessage("error",model,"save_failed");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("task_name", "Task Name"));
return form(taskInfo, model);
}
// 保存用户信息

3
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -83,7 +83,8 @@ public class RequestInfoController extends BaseController{
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage("error",model,"save_failed");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model);
}
// 保存用户信息

15
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -300,11 +300,16 @@ public class IpController extends BaseController{
,FunctionServiceDict serviceDict
,Integer requestId) throws Exception{
Properties pro=getMsgProp();
//String serviceName=pro.getProperty(serviceDict.getServiceName());
String regionName=pro.getProperty(regionDict.getConfigRegionValue());
//serviceName=StringUtil.isEmpty(serviceName) ?serviceDict.getServiceName():serviceName;
regionName=StringUtil.isEmpty(regionName) ?regionDict.getConfigRegionValue():regionName;
String fileName = regionName+"_Template.xlsx";
String menuCode = menuService.getMenuCodeByFunctionId(serviceDict.getFunctionId());
String menuName = pro.getProperty(menuCode);
String regionName = pro.getProperty(regionDict.getConfigRegionValue());
menuName = StringUtil.isEmpty(menuName) ? menuCode : menuName;
regionName = StringUtil.isEmpty(regionName) ? regionDict.getConfigRegionValue() : regionName;
String fileName = regionName + "_Template.xlsx";
if(!menuName.equalsIgnoreCase(regionName)) {
fileName = menuName +"_"+ fileName;
}
//ip类模板
if(regionDict.getRegionType().equals(1)){
if(regionDict.getFunctionId().equals(5)){// IP Address

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

@@ -26,6 +26,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.InterceptPktBin;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
@@ -60,9 +61,18 @@ public class InterceptController extends CommonController {
certificateList = pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "domain");
}
model.addAttribute("certificateList", certificateList);
// IP地址仿冒策略使用策略组
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6);
model.addAttribute("policyGroups", policyGroups);
/*if(cfg.getFunctionId().equals(214)){
// IP地址仿冒策略使用策略组
//List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6);
List<CfgIndexInfo> list = page.getList();
for(CfgIndexInfo c:list){
Long cfgId = Long.parseLong(c.getUserRegion2());//user_region2字段存储的为IP仿冒池的ID信息(策略组ID）
PxyObjSpoofingIpPool pool = pxyObjSpoofingIpPoolService.getPxyObjSpoofingIpPool(cfgId);
c.setUserRegion2(pool.getGroupName());//将IP仿冒池的策略组名重新赋给user_region2
}
// model.addAttribute("policyGroups", policyGroups);
}*/
return "/cfg/intercept/interceptList";
}
@@ -86,8 +96,9 @@ public class InterceptController extends CommonController {
model.addAttribute("_cfg", entity);
// IP地址仿冒策略使用策略组
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6);
model.addAttribute("policyGroups", policyGroups);
// List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6);
// List<PxyObjSpoofingIpPool> pools = pxyObjSpoofingIpPoolService.findPxyObjSpoofingIpPools(new PxyObjSpoofingIpPool());
// model.addAttribute("policyGroups", pools);
return "/cfg/intercept/interceptForm";
}

4
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java
View File

@@ -89,7 +89,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController {
model.addAttribute("isAdd", true);
}
List<PolicyGroupInfo> groups=policyGroupInfoService.findPolicyGroupInfosByType(6);
/*List<PolicyGroupInfo> groups=policyGroupInfoService.findPolicyGroupInfosByType(6);
List<PolicyGroupInfo> policyGroups = new ArrayList();
//解决目前一个分组只能有一个生效IP
for(PolicyGroupInfo group:groups){
@@ -101,7 +101,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController {
policyGroups.add(group);
}
}
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("policyGroups", policyGroups);*/
model.addAttribute("_cfg", cfg);
return "/cfg/proxy/spoofingIpPool/form";
}

58
src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java
View File

@@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -133,4 +134,61 @@ public class ConfigureStatisticsController extends BaseController{
map.put("ruleLimit", ruleLimit);
return map;
}
//configureStateStatisticsPrint
@ResponseBody
@RequestMapping(value = {"/configureStateStatisticsPrint"})
public Map configureStateStatisticsPrint(Model model,HttpServletRequest request
,HttpServletResponse response
,RedirectAttributes redirectAttributes){
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/****************************Request Info Statistics*****************************/
//1、查询所有有效的service
List<FunctionServiceDict> serviceDictList = DictUtils.getFunctionServiceDictList();
//2、查询所有菜单
List<SysMenu> menuList = UserUtils.getMenuCfgList();
//3、根据来函分页
RequestInfo requestInfo=new RequestInfo();
requestInfo.setIsAudit(1);
requestInfo.setIsValid(1);
Page page = new Page(request, response,"r");
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Page requestPage = requestInfoService.findRequestInfo(page,requestInfo);
List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
if(!StringUtil.isEmpty(requestStatisticTime)){
requestStatisticTimeStr=sdf.format(requestStatisticTime);
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
}
}
}
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}
Properties msgProp = getMsgProp();
for (int i = 0; i < menuList.size(); i++) {
String property = msgProp.getProperty(menuList.get(i).getCode(), menuList.get(i).getCode());
menuList.get(i).setCode(property);
}
requestPage.setList(requestStatisticList);
model.addAttribute("requestInfos", requestInfos);
model.addAttribute("serviceList", serviceDictList);
model.addAttribute("page", requestPage);
Map<String,Object> maps=new HashMap<String,Object>();
maps.put("menuList", menuList);
maps.put("requestStatisticList", requestStatisticList);
return maps;
}
}

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

@@ -71,7 +71,7 @@ public class TrafficStatisticsInfoController extends BaseController {
Double dropConnNum=0d;
Double monitorNum=0d;
Double loopConnNum=0d;
Double liveConnNum=0d;
Double closeConnNum=0d;
Double newUniConnNum=0d;
Double inoctetsNum=0d;
Double outoctetsNum=0d;
@@ -86,7 +86,7 @@ public class TrafficStatisticsInfoController extends BaseController {
monitorNum = (Double) map.get("monitorNum");
dropConnNum = (Double) map.get("dropConnNum");
loopConnNum = (Double) map.get("loopConnNum");
liveConnNum = (Double) map.get("liveConnNum");
closeConnNum = (Double) map.get("closeConnNum");
newUniConnNum = (Double) map.get("newUniConnNum");
inoctetsNum = (Double) map.get("inoctets");
outoctetsNum = (Double) map.get("outoctets");
@@ -100,7 +100,7 @@ public class TrafficStatisticsInfoController extends BaseController {
m.put("monitorNum", monitorNum);
m.put("loopConnNum", loopConnNum);
m.put("dropConnNum", dropConnNum);
m.put("liveConnNum", liveConnNum);
m.put("closeConnNum", closeConnNum);
m.put("newUniConnNum", newUniConnNum);
m.put("bandwidth", bandwidth);
@@ -681,7 +681,7 @@ public class TrafficStatisticsInfoController extends BaseController {
if("new_link".equals(searchAction)){
url=url+"&searchBusinessType="+3;
}
if("active_link".equals(searchAction)){
if("close_link".equals(searchAction)){
url=url+"&searchBusinessType="+4;
}
if("pass".equals(searchAction)){

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

@@ -34,6 +34,7 @@ import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcAsnRecord;
import com.nis.domain.report.NtcIpRangeReport;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.StringUtil;
@@ -69,7 +70,7 @@ public class TrafficStatisticsReportController extends BaseController {
if ("3".endsWith(searchBusinessType)) {
model.addAttribute("searchBusinessType", 3);// IP查询
}
String url = Constants.DASHBOARD_URL + Constants.NTC_RADIUS_REPORT;
String url = Configurations.getStringProperty("dashboardUrlV2","dashboardUrlV2") + Constants.NTC_RADIUS_REPORT;
String statTime = bean.getSearchFoundStartTime();
String endTime = bean.getSearchFoundEndTime();
String account = bean.getAccount();
@@ -221,7 +222,7 @@ public class TrafficStatisticsReportController extends BaseController {
if ("3".endsWith(searchBusinessType)) {
model.addAttribute("searchBusinessType", 3);// IP查询
}
String url = Constants.DASHBOARD_URL + Constants.NTC_RADIUS_REPORT;
String url = Configurations.getStringProperty("dashboardUrlV2","dashboardUrlV2")+ Constants.NTC_RADIUS_REPORT;
String statTime = bean.getSearchFoundStartTime();
String endTime = bean.getSearchFoundEndTime();
String account = bean.getAccount();

98
src/main/java/com/nis/web/controller/report/NtcEventBlockController.java
View File

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.gson.Gson;
@@ -35,16 +36,16 @@ import com.nis.util.Constants;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.basics.TaskInfoService;
import com.nis.web.service.configuration.RequestInfoService;
@Controller
@RequestMapping("${adminPath}/eventBlock")
public class NtcEventBlockController extends BaseController {
protected static Logger logger = LoggerFactory.getLogger(NtcEventBlockController.class);
@Autowired
private TaskInfoService taskInfoService;
private RequestInfoService requestInfoService;
/**
* EventBlock
@@ -89,15 +90,20 @@ public class NtcEventBlockController extends BaseController {
params.put("searchTaskStartTime", searchTaskStartTime);
params.put("searchTaskEndTime", searchTaskEndTime);
if (StringUtils.isNotBlank(log.getTaskIds())) {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
params.put("reportType", 1);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
// String url = "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
String recv = HttpClientUtil.getMsg(url, params, request);
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
@@ -111,7 +117,7 @@ public class NtcEventBlockController extends BaseController {
page.setList(data.getList());
model.addAttribute("page", page);
// 获取专项列表
List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> taskList = requestInfoService.showTask(new TaskInfo());
model.addAttribute("taskList", taskList);
}
}
@@ -142,7 +148,6 @@ public class NtcEventBlockController extends BaseController {
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
String searchReportStartTime = null;
String searchReportEndTime = null;
@@ -167,7 +172,6 @@ public class NtcEventBlockController extends BaseController {
params.put("searchReportEndTime", searchReportEndTime);
params.put("searchTaskStartTime", searchTaskStartTime);
params.put("searchTaskEndTime", searchTaskEndTime);
if (StringUtils.isNotBlank(log.getTaskIds())) {
params.put("taskIds", log.getTaskIds());
@@ -177,11 +181,12 @@ public class NtcEventBlockController extends BaseController {
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
params.put("reportType", 1);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
// String url = "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {
@@ -199,7 +204,7 @@ public class NtcEventBlockController extends BaseController {
titleList.add("ntc_event_block_report");
classMap.put("ntc_event_block_report", NtcEventMonitorOrBlockReport.class);
String cfgIndexInfoNoExport = "";
String cfgIndexInfoNoExport = "," + hColumns + ",";
noExportMap.put("ntc_event_block_report", cfgIndexInfoNoExport);
Properties msgProp = getMsgProp();
@@ -327,4 +332,75 @@ public class NtcEventBlockController extends BaseController {
return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
}
// eventBlockPrint
@ResponseBody
@RequestMapping(value = "eventBlockPrint")
public List<NtcEventMonitorOrBlockReport> eventBlockPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log,
Model model, HttpServletRequest request, HttpServletResponse response,
RedirectAttributes redirectAttributes) {
try {
PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
String searchReportStartTime = null;
String searchReportEndTime = null;
String searchTaskStartTime = null;
String searchTaskEndTime = null;
/**
* 对统计时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
searchReportStartTime = serachReportTimes[0];
searchReportEndTime = serachReportTimes[1];
/**
* 对报送时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
searchTaskStartTime = serachTaskTimes[0];
searchTaskEndTime = serachTaskTimes[1];
params.put("searchReportStartTime", searchReportStartTime);
params.put("searchReportEndTime", searchReportEndTime);
params.put("searchTaskStartTime", searchTaskStartTime);
params.put("searchTaskEndTime", searchTaskEndTime);
if (StringUtils.isNotBlank(log.getTaskIds())) {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
params.put("reportType", 1);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcEventMonitorOrBlockReport> fromJson = gson.fromJson(recv,
new TypeToken<LogRecvData<NtcEventMonitorOrBlockReport>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcEventMonitorOrBlockReport> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("ntc_event_block_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
}

83
src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java
View File

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.gson.Gson;
@@ -31,12 +32,11 @@ import com.nis.domain.PageLog;
import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcEventKeyProtectionReport;
import com.nis.domain.report.NtcEventMonitorOrBlockReport;
import com.nis.util.Constants;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.basics.TaskInfoService;
import com.nis.web.service.configuration.RequestInfoService;
@Controller
@RequestMapping("${adminPath}/eventKeyProtection")
@@ -45,7 +45,7 @@ public class NtcEventKeyProtectionController extends BaseController {
protected static Logger logger = LoggerFactory.getLogger(NtcEventKeyProtectionController.class);
@Autowired
private TaskInfoService taskInfoService;
private RequestInfoService requestInfoService;
/**
* EventBlock
@@ -94,6 +94,11 @@ public class NtcEventKeyProtectionController extends BaseController {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report;
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventKeyProtection";
@@ -110,7 +115,7 @@ public class NtcEventKeyProtectionController extends BaseController {
page.setList(data.getList());
model.addAttribute("page", page);
// 获取专项列表
List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> taskList = requestInfoService.showTask(new TaskInfo());
model.addAttribute("taskList", taskList);
}
}
@@ -195,7 +200,7 @@ public class NtcEventKeyProtectionController extends BaseController {
titleList.add("ntc_event_key_protection_report");
classMap.put("ntc_event_key_protection_report", NtcEventKeyProtectionReport.class);
String cfgIndexInfoNoExport = "";
String cfgIndexInfoNoExport = "," + hColumns + ",";
noExportMap.put("ntc_event_key_protection_report", cfgIndexInfoNoExport);
Properties msgProp = getMsgProp();
@@ -320,4 +325,72 @@ public class NtcEventKeyProtectionController extends BaseController {
return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
}
//eventKeyProtectionPrint
@ResponseBody
@RequestMapping(value = "eventKeyProtectionPrint")
public List<NtcEventKeyProtectionReport> eventKeyProtectionPrint(@ModelAttribute("log") NtcEventKeyProtectionReport log, Model model,
HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) {
try {
PageLog<NtcEventKeyProtectionReport> page = new PageLog<NtcEventKeyProtectionReport>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
String searchReportStartTime = null;
String searchReportEndTime = null;
String searchTaskStartTime = null;
String searchTaskEndTime = null;
/**
* 对统计时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
searchReportStartTime = serachReportTimes[0];
searchReportEndTime = serachReportTimes[1];
/**
* 对报送时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
searchTaskStartTime = serachTaskTimes[0];
searchTaskEndTime = serachTaskTimes[1];
params.put("searchReportStartTime", searchReportStartTime);
params.put("searchReportEndTime", searchReportEndTime);
params.put("searchTaskStartTime", searchTaskStartTime);
params.put("searchTaskEndTime", searchTaskEndTime);
if (StringUtils.isNotBlank(log.getTaskIds())) {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report;
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcEventKeyProtectionReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcEventKeyProtectionReport> fromJson = gson.fromJson(recv,
new TypeToken<LogRecvData<NtcEventKeyProtectionReport>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcEventKeyProtectionReport> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("ntc_event_key_protection_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
}

98
src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java
View File

@@ -2,9 +2,7 @@ package com.nis.web.controller.report;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -23,6 +21,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.gson.Gson;
@@ -32,15 +31,12 @@ import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.BaseReport;
import com.nis.domain.report.NtcEventMonitorOrBlockReport;
import com.nis.domain.report.NtcURLReport;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.basics.TaskInfoService;
import com.nis.web.service.configuration.RequestInfoService;
@Controller
@RequestMapping("${adminPath}/eventMonitor")
@@ -49,7 +45,7 @@ public class NtcEventMonitorController extends BaseController {
protected static Logger logger = LoggerFactory.getLogger(NtcEventMonitorController.class);
@Autowired
private TaskInfoService taskInfoService;
private RequestInfoService requestInfoService;
/**
* EventMonitor
@@ -98,11 +94,16 @@ public class NtcEventMonitorController extends BaseController {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
params.put("reportType", 2);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
String recv = HttpClientUtil.getMsg(url, params, request);
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
@@ -115,8 +116,7 @@ public class NtcEventMonitorController extends BaseController {
page.setLast(data.getLast());
page.setList(data.getList());
model.addAttribute("page", page);
// 获取专项列表
List<TaskInfo> taskList = taskInfoService.findTaskInfo(new TaskInfo());
List<TaskInfo> taskList = requestInfoService.showTask(new TaskInfo());
model.addAttribute("taskList", taskList);
}
}
@@ -184,8 +184,8 @@ public class NtcEventMonitorController extends BaseController {
params.put("reportType", 2);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
// String url =
// "http://192.168.11.56:8888/galaxy-service/service/log/v1/ntcEventsMonitorOrBlock";
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {
@@ -202,7 +202,7 @@ public class NtcEventMonitorController extends BaseController {
titleList.add("ntc_event_monitor_report");
classMap.put("ntc_event_monitor_report", NtcEventMonitorOrBlockReport.class);
String cfgIndexInfoNoExport = "";
String cfgIndexInfoNoExport = "," + hColumns + ",";
noExportMap.put("ntc_event_monitor_report", cfgIndexInfoNoExport);
Properties msgProp = getMsgProp();
@@ -330,4 +330,74 @@ public class NtcEventMonitorController extends BaseController {
return dateTime.toString(TimeConstants.YYYY_MM_DD_HH24_MM_SS);
}
// eventMonitorPrint
@ResponseBody
@RequestMapping(value = "eventMonitorPrint")
public List<NtcEventMonitorOrBlockReport> eventMonitorPrint(@ModelAttribute("log") NtcEventMonitorOrBlockReport log, Model model,
HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) {
try {
PageLog<NtcEventMonitorOrBlockReport> page = new PageLog<NtcEventMonitorOrBlockReport>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
String searchReportStartTime = null;
String searchReportEndTime = null;
String searchTaskStartTime = null;
String searchTaskEndTime = null;
/**
* 对统计时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachReportTimes = getSerachTimes(log.getSearchReportStartTime(), log.getSearchReportEndTime());
searchReportStartTime = serachReportTimes[0];
searchReportEndTime = serachReportTimes[1];
/**
* 对报送时间参数进行处理 开始-结束(一周内[7天])
*/
String[] serachTaskTimes = getSerachTimes(log.getSearchTaskStartTime(), log.getSearchTaskEndTime());
searchTaskStartTime = serachTaskTimes[0];
searchTaskEndTime = serachTaskTimes[1];
params.put("searchReportStartTime", searchReportStartTime);
params.put("searchReportEndTime", searchReportEndTime);
params.put("searchTaskStartTime", searchTaskStartTime);
params.put("searchTaskEndTime", searchTaskEndTime);
if (StringUtils.isNotBlank(log.getTaskIds())) {
params.put("taskIds", log.getTaskIds());
}
log.setSearchReportStartTime(searchReportStartTime);
log.setSearchReportEndTime(searchReportEndTime);
log.setSearchTaskStartTime(searchTaskStartTime);
log.setSearchTaskEndTime(searchTaskEndTime);
params.put("reportType", 2);
String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report;
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcEventMonitorOrBlockReport> list = new ArrayList<>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcEventMonitorOrBlockReport> fromJson = gson.fromJson(recv,
new TypeToken<LogRecvData<NtcEventMonitorOrBlockReport>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcEventMonitorOrBlockReport> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("ntc_event_monitor_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
}

155
src/main/java/com/nis/web/controller/report/ReportController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.gson.Gson;
@@ -567,4 +568,158 @@ public class ReportController extends BaseController {
addMessage(redirectAttributes, "error", "export_failed");
}
}
// asnPrint
@ResponseBody
@RequestMapping(value = "asnPrint")
public List<NtcAsnRecord> asnPrint(@ModelAttribute("log") NtcAsnRecord log, Model model,
HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
try {
PageLog<NtcAsnRecord> page = new PageLog<NtcAsnRecord>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
if (StringUtils.isNotEmpty(log.getSearchAsnType())) {
params.put("searchAsnType", log.getSearchAsnType());
} else {
params.put("searchAsnType", 1);
}
if (StringUtils.isNotBlank(log.getSearchFoundStartTime())
&& StringUtils.isNotBlank(log.getSearchFoundEndTime())) {
params.put("searchFoundStartTime", log.getSearchFoundStartTime());
params.put("searchFoundEndTime", log.getSearchFoundEndTime());
} else {
Calendar time = Calendar.getInstance();
String searchEndTime = DateUtils.formatDateTime(time.getTime());
time.add(Calendar.HOUR_OF_DAY, -1);
String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchFoundStartTime", searchStartTime);
params.put("searchFoundEndTime", searchEndTime);
log.setSearchFoundStartTime(searchStartTime);
log.setSearchFoundEndTime(searchEndTime);
}
String url = Constants.LOG_BASE_URL + Constants.NTC_ASN_RECORD;
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcAsnRecord> list = new ArrayList<NtcAsnRecord>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcAsnRecord> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcAsnRecord>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcAsnRecord> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("Ntc_Asn_Record print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
// httpsPrint
@ResponseBody
@RequestMapping(value = "httpsPrint")
public List<NtcURLReport> httpsPrint(@ModelAttribute("log") NtcURLReport log, Model model,
HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
try {
PageLog<NtcURLReport> page = new PageLog<NtcURLReport>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
// 判断请求参数
if (StringUtils.isNotBlank(log.getSearchReportStartTime())
&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {
params.put("searchReportStartTime", log.getSearchReportStartTime());
params.put("searchReportEndTime", log.getSearchReportEndTime());
} else {
Calendar time = Calendar.getInstance();
String searchEndTime = DateUtils.formatDateTime(time.getTime());
time.add(Calendar.HOUR_OF_DAY, -1);
String searchStartTime = DateUtils.formatDateTime(time.getTime());
params.put("searchReportStartTime", searchStartTime);
params.put("searchReportEndTime", searchEndTime);
log.setSearchReportStartTime(searchStartTime);
log.setSearchReportEndTime(searchEndTime);
}
// url参数
if (StringUtils.isNotBlank(log.getSearchUrl())) {
params.put("searchUrl", log.getSearchUrl());
}
String url = Constants.LOG_BASE_URL + Constants.NTC_URL_REPORT;
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcURLReport> list = new ArrayList<NtcURLReport>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcURLReport> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcURLReport>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcURLReport> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("Ntc_HTTPS_Report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
// ipRangePrint
@ResponseBody
@RequestMapping(value = "ipRangePrint")
public List<NtcIpRangeReport> ipRangePrint(@ModelAttribute("log") NtcIpRangeReport log, Model model,
HttpServletRequest request, HttpServletResponse response, String seType,RedirectAttributes redirectAttributes) {
try {
PageLog<NtcIpRangeReport> page = new PageLog<NtcIpRangeReport>(request, response);
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
log.setSearchAreaType(seType);
// 判断请求参数
// 查询国家
if (StringUtils.isNotBlank(log.getSearchCountry())) {
params.put("searchCountry", log.getSearchCountry());
}
// 查询开始IP
if (StringUtils.isNotBlank(log.getSearchStartIp())) {
params.put("searchIp", log.getSearchIp());
}
//
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchType", log.getSearchAreaType());
}
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchDesc", log.getSearchDesc());
}
String url = Constants.LOG_BASE_URL + Constants.NTC_IP_RANGE_REPORT;
String recv = HttpClientUtil.getMsg(url, params, request);
List<NtcIpRangeReport> list = new ArrayList<NtcIpRangeReport>();
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcIpRangeReport> fromJson = gson.fromJson(recv,
new TypeToken<LogRecvData<NtcIpRangeReport>>() {
}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcIpRangeReport> data = fromJson.getData();
list = data.getList();
}
}
return list;
} catch (Exception e) {
logger.error("Ntc_Ip_Range_Report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
}
return null;
}
}