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

(1)实时报表动作替换为serviceId

Browse Source 
(2)配置日志总量统计查询条件action替换为serviceId
(3)配置列表日志总量列加入serviceId
(4)配置日志总量跳转到日志列表action替换为serviceId
(5)配置日志相关js提取到pzLog。js中
This commit is contained in:
wangxin
2018-09-30 10:54:30 +08:00
parent e69191219a
commit 025182e551
51 changed files with 235 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/log/SearchReport.java
View File

@@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity<SearchReport>{
private Integer functionId;
private String cfgName;
private Integer action;
private Integer serviceId;
private String services;//service日志总量统计使用
private Integer reportType;//小时报，日报，月报
//标签，性质，来文函号，境内源Ip,各国目的IP，运营商局点
@@ -52,6 +53,12 @@ public class SearchReport extends BaseEntity<SearchReport>{
private String reportTime;
public Integer getServiceId() {
return serviceId;
}
public void setServiceId(Integer serviceId) {
this.serviceId = serviceId;
}
public String getServices() {
return services;
}

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

@@ -24,9 +24,9 @@ public class LogSearchController extends BaseController{
*/
// 获取相应日志检索菜单URL
String logUrl = menuService.getLogUrl(entity.getFunctionId());
Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
// Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
attr.addAttribute("service", serviceId);
attr.addAttribute("service", entity.getService().intValue());
attr.addAttribute("cfgId", entity.getCfgId());
attr.addAttribute("functionId", entity.getFunctionId());
attr.addAttribute("date", entity.getDate());

8
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -35,12 +35,8 @@ public class NtcDestIpReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

9
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -10,6 +10,7 @@ import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcEntranceReportController extends BaseController {
@RequestMapping("/ajaxNtcIspReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

10
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,7 +22,6 @@ import com.nis.domain.report.NtcLwhhReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -36,12 +36,8 @@ public class NtcLwhhReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

45
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -53,7 +53,7 @@ import net.sf.json.JsonConfig;
public class NtcPzReportController extends BaseController{
@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
@ResponseBody
public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,Integer functionId,String compileIds){
public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,String serviceIds,Integer functionId,String compileIds){
List<Map<String, Object>> dataList=new ArrayList<>();
SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
Date endDate=null;
@@ -95,22 +95,25 @@ public class NtcPzReportController extends BaseController{
logger.info("log search end time:"+sdf.format(endDate));
logger.info("log search start time:"+sdf.format(startDate));
}
String serviceIdsStr="";
StringBuffer serviceIds=new StringBuffer();
List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue());
for(String action:actions.split(",")) {
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==Integer.parseInt(action)){
serviceIds.append(service.getServiceId().intValue());
serviceIds.append(",");
}
}
}
if(serviceIds.toString().endsWith(",")) {
serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(","));
}
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
// String serviceIdsStr="";
// if(StringUtils.isBlank(serviceIds)) {
// StringBuffer _serviceIds=new StringBuffer();
// List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue());
// for(String action:actions.split(",")) {
// for(FunctionServiceDict service:serviceList){
// if(service.getAction().intValue()==Integer.parseInt(action)){
// _serviceIds.append(service.getServiceId().intValue());
// _serviceIds.append(",");
// }
// }
// }
// if(_serviceIds.toString().endsWith(",")) {
// serviceIdsStr=_serviceIds.toString().substring(0,_serviceIds.toString().lastIndexOf(","));
// }
// }else {
// serviceIdsStr=serviceIds;
// }
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
List<NtcPzReport> list=getList(json);
String[] idArr=compileIds.split(",");
if(list!=null&&(list.size()>0)){
@@ -136,12 +139,8 @@ public class NtcPzReportController extends BaseController{
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
model.addAttribute("labels", labels);
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

9
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcSrcipDomesticReportController extends BaseController {
@RequestMapping("/ajaxNtcSrcipDomesticReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

9
src/main/java/com/nis/web/controller/report/NtcTagReportController.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,12 +36,8 @@ public class NtcTagReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
model.addAttribute("labels", labels);
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

9
src/main/java/com/nis/web/controller/report/NtcXzReportController.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -36,12 +37,8 @@ public class NtcXzReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
model.addAttribute("xzs", xzs);
if(bean.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==bean.getAction().intValue()){
bean.setSearchService(service.getServiceId().toString());
}
}
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){