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

流量统计-统计页面的配置ID统计二级页面添加serviceId的查询条件

Browse Source
This commit is contained in:
shangguanyanfei
2019-06-26 11:37:39 +08:00
parent 9d47a56130
commit 2ed5ae2727
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,12 +368,13 @@ public class ConfigStatisticsController extends BaseController {
} }
} }
@RequestMapping("configTrans") @RequestMapping("configTrans")
public String configTrans(Model model,Integer cfgId,String beginDate,String endDate,String timeSize,String chartType,String cfgDesc){ public String configTrans(Model model,Integer cfgId,String beginDate,String endDate,String timeSize,String chartType,String cfgDesc,String serviceId){
model.addAttribute("timeSize", timeSize); model.addAttribute("timeSize", timeSize);
model.addAttribute("cfgId", cfgId); model.addAttribute("cfgId", cfgId);
model.addAttribute("beginDate", beginDate); model.addAttribute("beginDate", beginDate);
model.addAttribute("endDate", endDate); model.addAttribute("endDate", endDate);
model.addAttribute("chartType_1", chartType); model.addAttribute("chartType_1", chartType);
model.addAttribute("serviceId", serviceId);
if(!cfgDesc.equals("undefined") && !cfgDesc.equals("") && cfgDesc !=null){ if(!cfgDesc.equals("undefined") && !cfgDesc.equals("") && cfgDesc !=null){
model.addAttribute("cfgDesc", cfgDesc); model.addAttribute("cfgDesc", cfgDesc);
}else{ }else{
@@ -387,11 +388,14 @@ public class ConfigStatisticsController extends BaseController {
@RequestMapping("ajaxConfigStatistic") @RequestMapping("ajaxConfigStatistic")
@ResponseBody @ResponseBody
public List ajaxConfigStatistic(String cfgId,String timeSize,String cfgDesc,@RequestParam(required=false)String beginDate, public List ajaxConfigStatistic(String cfgId,String timeSize,String cfgDesc,@RequestParam(required=false)String beginDate,
@RequestParam(required=false)String endDate,Model model,HttpServletRequest request){ @RequestParam(required=false)String endDate,String serviceId,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>(); Map<String, Object> fromJsonList = new HashMap<String, Object>();
List resultList = new ArrayList(); List resultList = new ArrayList();
String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT; String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT;
url=url+"?pageSize=-1&searchCfgId="+cfgId; url=url+"?pageSize=-1&searchCfgId="+cfgId;
if(!StringUtil.isEmpty(serviceId)) {
url=url+"&searchService="+serviceId;
}
if(!StringUtil.isEmpty(timeSize)) { if(!StringUtil.isEmpty(timeSize)) {
if(timeSize.equals("1")){ if(timeSize.equals("1")){
url=url+"&searchBusinessType=2"; url=url+"&searchBusinessType=2";

4
src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp
View File

@@ -20,6 +20,7 @@
<input id="timeSize" type="hidden" value="${timeSize}"/> <input id="timeSize" type="hidden" value="${timeSize}"/>
<%-- <input id="chartType_1" type="hidden" value="${chartType_1}"/> --%> <%-- <input id="chartType_1" type="hidden" value="${chartType_1}"/> --%>
<input id="cfgDesc" type="hidden" value="${cfgDesc}"/> <input id="cfgDesc" type="hidden" value="${cfgDesc}"/>
<input id="serviceId" type="hidden" value="${serviceId}"/>
<input id="total" type="hidden"/> <input id="total" type="hidden"/>
<div class="pull-left" style="padding-top: 6px;padding-left: 10px;"> <div class="pull-left" style="padding-top: 6px;padding-left: 10px;">
<div class="input-group"> <div class="input-group">
@@ -65,11 +66,12 @@ $(document).ready(function(){
var cfgId=$("#cfgId").val(); var cfgId=$("#cfgId").val();
var timeSize=$("#timeSize").val(); var timeSize=$("#timeSize").val();
var chartType = $("#chartType").val(); var chartType = $("#chartType").val();
var serviceId = $("#serviceId").val();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/traffic/ajaxConfigStatistic', url: '${ctx}/dashboard/traffic/ajaxConfigStatistic',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
data:{"beginDate":beginDate,"endDate":endDate,"timeSize":timeSize,"cfgId":cfgId}, data:{"beginDate":beginDate,"endDate":endDate,"timeSize":timeSize,"cfgId":cfgId,"serviceId":serviceId},
async:true, async:true,
timeout:50000, timeout:50000,
success:function (rs) { success:function (rs) {

6
src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp
View File

@@ -17,7 +17,7 @@
<tbody> <tbody>
<c:forEach var="log" items="${page.list }" varStatus="status"> <c:forEach var="log" items="${page.list }" varStatus="status">
<tr> <tr>
<td class='tc'><a href='#' onclick="searchByConfig('${log.cfgId}','${log.cfgDesc}')"><i class='fa fa-line-chart'></i></a></td> <td class='tc'><a href='#' onclick="searchByConfig('${log.cfgId}','${log.cfgDesc}','${log.serviceId}')"><i class='fa fa-line-chart'></i></a></td>
<td>${log.cfgId}</td> <td>${log.cfgId}</td>
<td>${log.cfgDesc }</td> <td>${log.cfgDesc }</td>
<td>${log.sum }</td> <td>${log.sum }</td>
@@ -36,12 +36,12 @@
//配置统计页面 配置ID点击事件 //配置统计页面 配置ID点击事件
function searchByConfig(cfgId,cfgDesc){ function searchByConfig(cfgId,cfgDesc,serviceId){
var beginDate = $("#beginDate").val(); var beginDate = $("#beginDate").val();
var endDate = $("#endDate").val(); var endDate = $("#endDate").val();
var timeSize = $(".timeSize:checked").val(); var timeSize = $(".timeSize:checked").val();
var chartType = $("#chartType").val(); var chartType = $("#chartType").val();
var url= "${ctx}/dashboard/traffic/configTrans?beginDate="+beginDate+"&endDate="+endDate+"&timeSize="+timeSize+"&cfgId="+cfgId+"&chartType="+chartType+"&cfgDesc="+cfgDesc; var url= "${ctx}/dashboard/traffic/configTrans?beginDate="+beginDate+"&endDate="+endDate+"&timeSize="+timeSize+"&cfgId="+cfgId+"&chartType="+chartType+"&cfgDesc="+cfgDesc+"&serviceId="+serviceId;
openPicWindow(url); openPicWindow(url);
} }
//点击 配置Id的弹窗方法 //点击 配置Id的弹窗方法