diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index c49373f12..7d52b4211 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -743,4 +743,7 @@ public final class Constants { public static final Integer DEFAULT_MAX_PERROUTE=Configurations.getIntProperty("default_max_perroute", 100); public static final Integer POOLCM_SOCKET_TIMEOUT=Configurations.getIntProperty("poolcm_socket_timeout", 3000); + public static final String POLICIES_MENU_ID=Configurations.getStringProperty("policies_menu_id", "86"); + + } 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 8a2bb006f..523e918d9 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 @@ -28,6 +28,7 @@ import com.mchange.v1.util.MapUtils; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.SysArea; +import com.nis.domain.SysMenu; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.RequestInfo; import com.nis.util.CacheUtils; @@ -36,6 +37,7 @@ import com.nis.util.DictUtils; import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; +import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; import com.nis.web.service.CommonService; @@ -57,13 +59,15 @@ public class ConfigureStatisticsController extends BaseController{ /****************************Request Info Statistics*****************************/ //1、查询所有有效的service List serviceDictList = DictUtils.getFunctionServiceDictList(); - //2、根据来函分页 + //2、查询所有菜单 + List menuList = UserUtils.getMenuCfgList(); + //3、根据来函分页 RequestInfo requestInfo=new RequestInfo(); requestInfo.setIsAudit(1); requestInfo.setIsValid(1); Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo); List requestInfos=requestPage.getList(); - //3、根据当前页的requestInfo信息查询request统计信息 + //4、根据当前页的requestInfo信息查询request统计信息 List requestStatisticList=new ArrayList(); if(!StringUtil.isEmpty(requestInfos)){ Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime(); @@ -71,7 +75,7 @@ public class ConfigureStatisticsController extends BaseController{ if(!StringUtil.isEmpty(requestStatisticTime)){ requestStatisticTimeStr=sdf.format(requestStatisticTime); } - requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,serviceDictList,requestStatisticTimeStr); + requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr); if(!StringUtil.isEmpty(requestStatisticList)){ for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) { Map map = (Map) iterator.next(); diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.java b/src/main/java/com/nis/web/dao/SysMenuDao.java index 9d9185231..76dff1bb4 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.java +++ b/src/main/java/com/nis/web/dao/SysMenuDao.java @@ -24,4 +24,6 @@ public interface SysMenuDao extends CrudDao{ Integer getServiceId(@Param("functionId")Integer functionId, @Param("action")Integer action); + List findAllCfgList(@Param("policiesMenuId")String policiesMenuId); + } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.xml b/src/main/java/com/nis/web/dao/SysMenuDao.xml index e9bd0d3ee..3d4114539 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.xml +++ b/src/main/java/com/nis/web/dao/SysMenuDao.xml @@ -27,6 +27,30 @@ a.function_id + + a.id, + a.parent_id AS "parent.id", + a.parent_ids, + a.code, + a.name, + a.href, + a.target, + a.icon, + a.sort, + a.is_show, + a.permission, + a.remarks, + a.create_by AS "createBy.id", + a.create_date, + a.update_by AS "updateBy.id", + a.update_date, + a.del_flag, + a.quick_action, + a.menu_bg, + a.is_top, + a.function_id + + LEFT JOIN sys_menu p ON p.id = a.parent_id @@ -48,6 +72,18 @@ WHERE a.del_flag = #{DEL_FLAG_NORMAL} ORDER BY a.sort + + + select c.function_id functionId, + sum(case when c.cfg_state =1 then 1 else 0 end) as approved, + sum(case when c.cfg_state =2 then 1 else 0 end) as unapproved, + 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 cfg_num_statistics c where c.statistic_time = #{statisticTime} + group by c.function_id; + + +