首页来函业务类型统计功能

修改部分页面十六进制校验不生效bug
更换logo

src/main/java/com/nis/util/DictUtils.java

@@ -238,4 +238,20 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
+	 * @param functionId
+	 * @return
+	 */
+	public static List<FunctionRegionDict> getFunctionRegionDictList(){
+		List<FunctionRegionDict> allDictList = (List<FunctionRegionDict>)CacheUtils.get(Constants.CACHE_FUNCTION_REGION_DICT);
+		List<FunctionRegionDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionRegionDict entity = new FunctionRegionDict();
+			allDictList = functionRegionDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, allDictList);
+		}
+		
+		return allDictList;		
+	}
 }

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

@@ -3,6 +3,7 @@ package com.nis.web.controller.configuration.statistics;
 
 
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -16,10 +17,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.RequestInfo;
 import com.nis.util.CacheUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.BaseService;
 import com.nis.web.service.CommonService;
@@ -37,11 +41,32 @@ public class ConfigureStatisticsController extends BaseController{
 	public String configStateStatistics(Model model,HttpServletRequest request
 			,HttpServletResponse response
 			,RedirectAttributes redirectAttributes){
-		
+		/****************************Request Info Statistics*****************************/
+		//1、查询所有有效的service
 		List<FunctionServiceDict> serviceDictList = DictUtils.getFunctionServiceDictList();
-		List<Object[]> list = configureStatisticsService.getConfigStateStatistics();
-		
+		//2、根据来函分页
+		RequestInfo requestInfo=new RequestInfo();
+		requestInfo.setIsAudit(1);
+		Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo);
+		List<RequestInfo> requestInfos=requestPage.getList();
+		//3、根据当前页的requestInfo信息查询request统计信息
+		List<Object[]> requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,serviceDictList);
+		if(!StringUtil.isEmpty(requestStatisticList)){
+				for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
+					Map map = (Map) iterator.next();
+					for (RequestInfo requestInfoO : requestInfos) {
+						if(requestInfoO.getId().toString().equals(map.get("request").toString())){
+							map.put("request", requestInfoO.getRequestTitle());
+						}
+					}
+				}
+		}
+		requestPage.setList(requestStatisticList);
+		model.addAttribute("requestInfos", requestInfos);
 		model.addAttribute("serviceList", serviceDictList);
+		model.addAttribute("page", requestPage);
+		/****************************Config Status Info Statistics*****************************/
+		List<Object[]> list = configureStatisticsService.getConfigStateStatistics();
 		model.addAttribute("configStatistics", list);
 		return "/index";
 	}

src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java

@@ -5,11 +5,15 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
 import com.nis.domain.configuration.HttpBodyCfg;
+import com.nis.domain.configuration.RequestInfo;
 import com.nis.web.dao.MyBatisDao;
 
 
 @MyBatisDao
 public interface ConfigureStatisticsDao {
 	public List<Object[]> getConfigStateStatistics( ) ;
+	public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList) ;
 }

src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml

@@ -12,4 +12,27 @@
 				from cfg_num_statistics c
 		group by service_id;
   </select>
+  
+  <select id="getRequestStateStatistics" resultType="java.util.LinkedHashMap">
+		select request_id request,
+      		<foreach item="serivice" collection="serviceList" separator=",">
+	      		sum(case  when c.service_id =${serivice.serviceId} then 1 else 0 end)  as ${serivice.serviceName}
+      		</foreach>
+		from request_num_statistics c
+		where request_id in 
+			<foreach item="requestInfo" collection="requestList" separator="," open="(" close=")">
+	      		${requestInfo.id}
+      		</foreach>
+		group by request_id
+  </select>
+  <!-- <select id="getRequestStateCount" resultType="long">
+		select count(request_id) count
+			from 
+				(request_id request,
+		      		<foreach item="serivice" collection="serviceList" separator=",">
+			      		sum(case  when c.service_id =${serivice.serviceId} then 1 else 0 end)  as ${serivice.serviceName}
+		      		</foreach>
+				from request_num_statistics c
+				group by request_id)
+  </select> -->
 </mapper>

src/main/java/com/nis/web/service/configuration/statistics/ConfigureStatisticsService.java

@@ -6,9 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
+import com.nis.domain.configuration.RequestInfo;
 import com.nis.util.Constants;
 import com.nis.web.dao.configuration.NumCfgDao;
 import com.nis.web.dao.configuration.statistics.ConfigureStatisticsDao;
@@ -25,4 +28,8 @@ public class ConfigureStatisticsService extends CrudService<NumCfgDao,NumBoundar
 	public List<Object[]> getConfigStateStatistics(){
 		return configureStatisticsDao.getConfigStateStatistics();
 	}
+	public List<Object[]>  getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList){
+		List<Object[]> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,serviceList);
+		return dataList;
+	}
 }