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

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
9 changed files with 319 additions and 18 deletions

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;