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")
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("cfgId", cfgId);
model.addAttribute("beginDate", beginDate);
model.addAttribute("endDate", endDate);
model.addAttribute("chartType_1", chartType);
model.addAttribute("serviceId", serviceId);
if(!cfgDesc.equals("undefined") && !cfgDesc.equals("") && cfgDesc !=null){
model.addAttribute("cfgDesc", cfgDesc);
}else{
@@ -387,11 +388,14 @@ public class ConfigStatisticsController extends BaseController {
@RequestMapping("ajaxConfigStatistic")
@ResponseBody
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>();
List resultList = new ArrayList();
String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT;
url=url+"?pageSize=-1&searchCfgId="+cfgId;
if(!StringUtil.isEmpty(serviceId)) {
url=url+"&searchService="+serviceId;
}
if(!StringUtil.isEmpty(timeSize)) {
if(timeSize.equals("1")){
url=url+"&searchBusinessType=2";