From 4ed438f8aa45bfc7e526e4f6eef55fb99a3040a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= Date: Mon, 21 Jan 2019 06:54:35 +0000 Subject: [PATCH] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE->=E9=82=AE=E7=AE=B1=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6,?= =?UTF-8?q?=E9=80=89"=E5=8A=A8=E4=BD=9C"=E6=97=B6=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=92=8C=E9=98=BB=E6=96=AD=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84Service=202.=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8->?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=92=8C=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E5=A2=9E=E5=8A=A0=20=E6=96=B9=E5=90=91=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6,out=E4=B8=BA0=20in?= =?UTF-8?q?=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3612bf09d9cb9f2ed7b89d00953175e5dcb880bf) --- .../TrafficStatisticsInfoController.java | 9 ++-- .../controller/log/ntc/MailLogController.java | 53 ++++++++++++++++--- .../views/dashboard/trafficBandwidthList.jsp | 42 +++++++++++---- .../dashboard/trafficProtocolTypeList.jsp | 33 ++++++++++-- 4 files changed, 112 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 1346a205a..7efbbc582 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -262,7 +262,7 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="bandwidthTransThree") @ResponseBody - public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType){ + public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,Model model){ Map fromJsonList = new HashMap(); Map map = new HashMap(); //String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO; @@ -271,11 +271,13 @@ public class TrafficStatisticsInfoController extends BaseController { try { url=urlAddDate(url,beginDate,endDate); url=url+"&searchQuotaType="+searchQuotaType; + url=url+"&searchDirection="+searchDirection; String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); logger.debug("bandwidthTransThree服务查询数据成功"); Map result = (Map)fromJsonList.get("data"); + model.addAttribute("searchDirection", searchDirection); return result; } catch (Exception e) { e.printStackTrace(); @@ -302,7 +304,7 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="protocolList") @ResponseBody - public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){ + public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,@RequestParam(required=false)String searchDirection){ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map fromJsonList = new HashMap(); List list = new ArrayList(); @@ -319,6 +321,7 @@ public class TrafficStatisticsInfoController extends BaseController { if(entranceId!=null){ url=url+"&entranceId="+entranceId; } + url=url+"&searchDirection="+searchDirection; String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); @@ -363,7 +366,7 @@ public class TrafficStatisticsInfoController extends BaseController { m.put("totalGByte", totalGByte); } } - + model.addAttribute("searchDirection", searchDirection); } catch (Exception e) { e.printStackTrace(); logger.error("协议详情数据获取错误"+e); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java index ec8df1b33..34a2cdf89 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java @@ -30,6 +30,7 @@ import com.nis.domain.log.NtcMailLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; +import com.nis.util.StringUtil; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -46,6 +47,28 @@ public class MailLogController extends BaseController { Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + if (StringUtil.isEmpty(log.getService())) { + String searchService = ""; + for (int i = 0; i < serviceList.size(); i++) { + if (i != 0) { + searchService += ","; + + } + searchService += (serviceList.get(i).getServiceId() == null ? "" + : serviceList.get(i).getServiceId()); + // log.setAction(serviceList.get(i).getAction()); + } + + if (StringUtils.isNotBlank(searchService)) { + params.put("searchService", searchService); + } + } else { + log.setAction(serviceList.get(0).getAction()); + } + initLogSearchValue(log, params); // 增加收/发件人、邮件主题查询 @@ -59,9 +82,6 @@ public class MailLogController extends BaseController { params.put("searchSubject", StringEscapeUtils.unescapeHtml(log.getSubject())); } - List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); - model.addAttribute("serviceList", serviceList); - String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG; String recv = HttpClientUtil.getMsg(url, params, request); @@ -108,6 +128,27 @@ public class MailLogController extends BaseController { Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + if (StringUtil.isEmpty(log.getService())) { + String searchService = ""; + for (int i = 0; i < serviceList.size(); i++) { + if (i != 0) { + searchService += ","; + + } + searchService += (serviceList.get(i).getServiceId() == null ? "" + : serviceList.get(i).getServiceId()); + // log.setAction(serviceList.get(i).getAction()); + } + + if (StringUtils.isNotBlank(searchService)) { + params.put("searchService", searchService); + } + } else { + log.setAction(serviceList.get(0).getAction()); + } initLogSearchValue(log, params); // 增加收/发件人、邮件主题查询 @@ -120,9 +161,7 @@ public class MailLogController extends BaseController { if (StringUtils.isNotBlank(log.getSubject())) { params.put("searchSubject", StringEscapeUtils.unescapeHtml(log.getSubject())); } - - List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); - model.addAttribute("serviceList", serviceList); + String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG; String recv = HttpClientUtil.getMsg(url, params, request); @@ -151,7 +190,7 @@ public class MailLogController extends BaseController { String cfgIndexInfoNoExport = "," + hColumns; noExportMap.put("mail_control", cfgIndexInfoNoExport); dataMap.put("mail_control", list); - String timeRange= initLogMap(log,"mail_control"); + String timeRange = initLogMap(log, "mail_control"); noExportMap.put("timeRange", timeRange); /* } */ if ("csv".equals(type)) { diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index a2b750c3f..715393710 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -38,15 +38,36 @@ value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
-
-
- -
- -
-
- +
+
+ +
+ +
+ + +
+
+
+ +
+<%-- --%> + +
+
+
@@ -134,10 +155,11 @@ function searchList(){ // 根据单位切换数据 function changeBandwidth(unitType,beginDate,endDate){ + var searchDirection=$("#searchDirection").val(); $.ajax({ url:"${ctx}/dashboard/traffic/bandwidthTransThree", type:"get", - data:{"beginDate":beginDate,"endDate":endDate,"searchQuotaType":unitType}, + data:{"beginDate":beginDate,"endDate":endDate,"searchQuotaType":unitType,"searchDirection":searchDirection}, dataType:"json", async:true, timeout:50000, diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp index 93fddf86d..7a21e7a38 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp @@ -71,10 +71,32 @@
-
- - -
+ +
+
+
+ +
+ <%-- --%> + +
+
+ +
+ + +
@@ -164,12 +186,13 @@ function searchList(){ } function ajaxProtocolList(start,end,entranceId){ var protoType=$("#protoType").val(); + var searchDirection=$("#searchDirection").val(); loading(); $.ajax({ url: '${ctx}/dashboard/traffic/protocolList', type: 'get', dataType: "json", - data:{"beginDate":start,"endDate":end,"protoType":protoType,"entranceId":entranceId}, + data:{"beginDate":start,"endDate":end,"protoType":protoType,"entranceId":entranceId,"searchDirection":searchDirection}, async:true, timeout:50000, traditional:true,