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

国际化新增default_request 默认来函

Browse Source 
优化首页统计，避免空情况出现。
部分业务来函为默认来函，展示默认来函
This commit is contained in:
duandongmei
2018-11-01 11:10:52 +08:00
parent 883dea867a
commit 07fd611b53
9 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@ package com.nis.web.controller.configuration.statistics;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -46,10 +48,12 @@ import com.nis.web.service.CommonService;
@RequestMapping("${adminPath}/configure/statistics")
public class ConfigureStatisticsController extends BaseController{
@RequestMapping(value = {"/configureStateStatistics"})
public String configStateStatistics(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();
@@ -61,7 +65,12 @@ public class ConfigureStatisticsController extends BaseController{
//3、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
if(!StringUtil.isEmpty(requestInfos)){
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,serviceDictList);
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
if(!StringUtil.isEmpty(requestStatisticTime)){
requestStatisticTimeStr=sdf.format(requestStatisticTime);
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,serviceDictList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
@@ -72,16 +81,22 @@ public class ConfigureStatisticsController extends BaseController{
}
}
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}
requestPage.setList(requestStatisticList);
model.addAttribute("requestInfos", requestInfos);
model.addAttribute("serviceList", serviceDictList);
model.addAttribute("requestStatisticTime", configureStatisticsService.getRequestStatisticTime());
model.addAttribute("page", requestPage);
/****************************Config Status Info Statistics*****************************/
List<Object[]> list = configureStatisticsService.getConfigStateStatistics();
Date cfgStatisticTime=configureStatisticsService.getConfigStatisticTime();
String cfgStatisticTimeStr="";
if(!StringUtil.isEmpty(cfgStatisticTime)){
cfgStatisticTimeStr=sdf.format(cfgStatisticTime);
}
List<Object[]> list = configureStatisticsService.getConfigStateStatistics(cfgStatisticTimeStr);
model.addAttribute("configStatistics", list);
model.addAttribute("configStatisticTime", configureStatisticsService.getConfigStatisticTime());
model.addAttribute("configStatisticTime", cfgStatisticTimeStr);
return "/index";
}