From 07fd611b53dc31c24caa3ff805817608e4e32333 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 1 Nov 2018 11:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=B0=E5=A2=9Ede?= =?UTF-8?q?fault=5Frequest=20=E9=BB=98=E8=AE=A4=E6=9D=A5=E5=87=BD=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=83=85=E5=86=B5=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E3=80=82=20=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1=E6=9D=A5?= =?UTF-8?q?=E5=87=BD=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=9D=A5=E5=87=BD=EF=BC=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=BB=98=E8=AE=A4=E6=9D=A5=E5=87=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigureStatisticsController.java | 23 +++++++++++++++---- .../statistics/ConfigureStatisticsDao.java | 9 ++++---- .../statistics/ConfigureStatisticsDao.xml | 23 +++++++++---------- .../ConfigureStatisticsService.java | 19 ++++++++------- .../resources/messages/message_en.properties | 3 ++- .../resources/messages/message_ru.properties | 3 ++- .../messages/message_zh_CN.properties | 3 ++- .../sql/20181101/update_dictionary_dict.sql | 18 +++++++++++++++ src/main/webapp/WEB-INF/views/index.jsp | 21 ++++++++--------- 9 files changed, 80 insertions(+), 42 deletions(-) create mode 100644 src/main/resources/sql/20181101/update_dictionary_dict.sql 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