国际化新增default_request 默认来函
优化首页统计，避免空情况出现。 部分业务来函为默认来函，展示默认来函
This commit is contained in:
duandongmei
@@ -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";
|
||||
}
|
||||
|
||||
|
||||
@@ -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<Object[]> getConfigStateStatistics( );
|
||||
public List<Object[]> getConfigStatisticTime();
|
||||
public List<Object[]> getRequestStatisticTime();
|
||||
public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList) ;
|
||||
public List<Object[]> getConfigStateStatistics(@Param("statisticTime")String statisticTime);
|
||||
public Date getConfigStatisticTime();
|
||||
public Date getRequestStatisticTime();
|
||||
public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList,@Param("statisticTime")String statisticTime) ;
|
||||
public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
</select>
|
||||
|
||||
@@ -18,22 +21,18 @@
|
||||
<foreach item="serivice" collection="serviceList" separator=",">
|
||||
sum(case when c.service_id =${serivice.serviceId} then 1 else 0 end) as ${serivice.serviceName}
|
||||
</foreach>
|
||||
from (select distinct service_id,request_id,compile_id from request_num_statistics) c
|
||||
where request_id in
|
||||
<foreach item="requestInfo" collection="requestList" separator="," open="(" close=")">
|
||||
${requestInfo.id}
|
||||
</foreach>
|
||||
from (select distinct service_id,request_id,compile_id from request_num_statistics
|
||||
where statistic_time =#{statisticTime}
|
||||
) c
|
||||
group by request_id
|
||||
</select>
|
||||
<select id="getConfigStatisticTime" resultType="java.util.LinkedHashMap">
|
||||
select statistic_time
|
||||
<select id="getConfigStatisticTime" resultType="java.util.Date">
|
||||
select min(statistic_time) statistic_time
|
||||
from cfg_num_statistics c
|
||||
order by statistic_time asc
|
||||
</select>
|
||||
<select id="getRequestStatisticTime" resultType="java.util.LinkedHashMap">
|
||||
select statistic_time
|
||||
<select id="getRequestStatisticTime" resultType="java.util.Date">
|
||||
select min(statistic_time)
|
||||
from request_num_statistics c
|
||||
order by statistic_time asc
|
||||
</select>
|
||||
<!-- <select id="getRequestStateCount" resultType="long">
|
||||
select count(request_id) count
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.nis.web.service.configuration.statistics;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -25,17 +26,19 @@ public class ConfigureStatisticsService extends CrudService<NumCfgDao,NumBoundar
|
||||
@Autowired
|
||||
protected ConfigureStatisticsDao configureStatisticsDao;
|
||||
|
||||
public List<Object[]> getConfigStateStatistics(){
|
||||
return configureStatisticsDao.getConfigStateStatistics();
|
||||
public List<Object[]> getConfigStateStatistics(String statisticTime){
|
||||
return configureStatisticsDao.getConfigStateStatistics(statisticTime);
|
||||
}
|
||||
public List<Object[]> getConfigStatisticTime(){
|
||||
return configureStatisticsDao.getConfigStatisticTime();
|
||||
public Date getConfigStatisticTime(){
|
||||
Date statisticTime=configureStatisticsDao.getConfigStatisticTime();
|
||||
return statisticTime;
|
||||
}
|
||||
public List<Object[]> getRequestStatisticTime(){
|
||||
return configureStatisticsDao.getRequestStatisticTime();
|
||||
public Date getRequestStatisticTime(){
|
||||
Date statisticTime=configureStatisticsDao.getRequestStatisticTime();
|
||||
return statisticTime;
|
||||
}
|
||||
public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList){
|
||||
List<Object[]> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,serviceList);
|
||||
public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList,String statistcTime){
|
||||
List<Object[]> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,serviceList,statistcTime);
|
||||
return dataList;
|
||||
}
|
||||
public Integer getEffectiveCfgNum(Integer serviceId){
|
||||
|
||||
Reference in New Issue
Block a user