gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
request 和配置状态统计增加编译id
xml增加compileId去重
首页增加统计时间展示
This commit is contained in:
duandongmei
2018-09-19 10:20:48 +08:00
parent 348f822a02 c60e42d2ba
commit 7daf953fe3
9 changed files with 319 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,10 +68,12 @@ public class ConfigureStatisticsController extends BaseController{
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();
model.addAttribute("configStatistics", list);
model.addAttribute("configStatisticTime", configureStatisticsService.getConfigStatisticTime());
return "/index";
}
}

16
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -69,11 +69,17 @@
<if test="isValid == null">
AND r.IS_VALID != -1
</if>
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate}
<if test="beginDate!=null and beginDate!=''">
AND r.request_time &gt;= #{beginDate}
</if>
<if test="endDate!=null and endDate!=''">
AND r.request_time &lt;= #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' ">
AND r.edit_time &gt;= #{dobeginDate}
</if>
<if test="doendDate!=null and doendDate!=''">
AND r.edit_time &lt;= #{doendDate}
</if>
<!-- 数据范围过滤 -->
${sqlMap.dsf}

14
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -65,11 +65,17 @@
<if test="isAudit != null">
AND r.is_audit=${isAudit}
</if>
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.task_time between #{beginDate} and #{endDate}
<if test="beginDate!=null and beginDate!='' ">
AND r.task_time &gt;= #{beginDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate}
<if test="endDate!=null and endDate!=''">
AND r.task_time &lt;= #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' ">
AND r.edit_time &gt;= #{dobeginDate}
</if>
<if test="doendDate!=null and doendDate!=''">
AND r.edit_time &lt;= #{doendDate}
</if>
<!-- 数据范围过滤 -->

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

@@ -14,6 +14,8 @@ import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface ConfigureStatisticsDao {
public List<Object[]> getConfigStateStatistics( ) ;
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) ;
}

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

@@ -9,7 +9,7 @@
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
from (select distinct cfg_state,service_id,compile_id from cfg_num_statistics) c
group by service_id;
</select>
@@ -18,13 +18,23 @@
<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
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>
group by request_id
</select>
<select id="getConfigStatisticTime" resultType="java.util.LinkedHashMap">
select statistic_time
from cfg_num_statistics c
order by statistic_time asc
</select>
<select id="getRequestStatisticTime" resultType="java.util.LinkedHashMap">
select statistic_time
from request_num_statistics c
order by statistic_time asc
</select>
<!-- <select id="getRequestStateCount" resultType="long">
select count(request_id) count
from

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

@@ -28,6 +28,12 @@ public class ConfigureStatisticsService extends CrudService<NumCfgDao,NumBoundar
public List<Object[]> getConfigStateStatistics(){
return configureStatisticsDao.getConfigStateStatistics();
}
public List<Object[]> getConfigStatisticTime(){
return configureStatisticsDao.getConfigStatisticTime();
}
public List<Object[]> getRequestStatisticTime(){
return configureStatisticsDao.getRequestStatisticTime();
}
public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList){
List<Object[]> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,serviceList);
return dataList;