diff --git a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java index 3b69f6f0f..66d95018d 100644 --- a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java +++ b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java @@ -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 serviceDictList = DictUtils.getFunctionServiceDictList(); @@ -61,7 +65,12 @@ public class ConfigureStatisticsController extends BaseController{ //3、根据当前页的requestInfo信息查询request统计信息 List requestStatisticList=new ArrayList(); 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 list = configureStatisticsService.getConfigStateStatistics(); + Date cfgStatisticTime=configureStatisticsService.getConfigStatisticTime(); + String cfgStatisticTimeStr=""; + if(!StringUtil.isEmpty(cfgStatisticTime)){ + cfgStatisticTimeStr=sdf.format(cfgStatisticTime); + } + List list = configureStatisticsService.getConfigStateStatistics(cfgStatisticTimeStr); model.addAttribute("configStatistics", list); - model.addAttribute("configStatisticTime", configureStatisticsService.getConfigStatisticTime()); + model.addAttribute("configStatisticTime", cfgStatisticTimeStr); return "/index"; } diff --git a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java index 147c6c626..0349e01a8 100644 --- a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java +++ b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java @@ -1,6 +1,7 @@ package com.nis.web.dao.configuration.statistics; +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -14,9 +15,9 @@ import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface ConfigureStatisticsDao { - public List getConfigStateStatistics( ); - public List getConfigStatisticTime(); - public List getRequestStatisticTime(); - public List getRequestStateStatistics(@Param("requestList")List requestList,@Param("serviceList")List serviceList) ; + public List getConfigStateStatistics(@Param("statisticTime")String statisticTime); + public Date getConfigStatisticTime(); + public Date getRequestStatisticTime(); + public List getRequestStateStatistics(@Param("requestList")List requestList,@Param("serviceList")List serviceList,@Param("statisticTime")String statisticTime) ; public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId); } diff --git a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml index 8e4634a75..91b12e26c 100644 --- a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml @@ -9,7 +9,10 @@ sum(case when c.cfg_state =3 then 1 else 0 end) as cancle_approved, sum(case when c.cfg_state =0 then 1 else 0 end) as created, sum(case when c.cfg_state =-1 then 1 else 0 end) as deleted - from (select distinct cfg_state,service_id,compile_id from cfg_num_statistics) c + from ( + select distinct cfg_state,service_id,compile_id from cfg_num_statistics + where statistic_time = #{statisticTime} + ) c group by service_id; @@ -18,22 +21,18 @@ sum(case when c.service_id =${serivice.serviceId} then 1 else 0 end) as ${serivice.serviceName} - from (select distinct service_id,request_id,compile_id from request_num_statistics) c - where request_id in - - ${requestInfo.id} - + from (select distinct service_id,request_id,compile_id from request_num_statistics + where statistic_time =#{statisticTime} + ) c group by request_id - + select min(statistic_time) statistic_time from cfg_num_statistics c - order by statistic_time asc - + select min(statistic_time) from request_num_statistics c - order by statistic_time asc