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

优化动作，网站流量详情接口算法，动作增加drop，loop

Browse Source
This commit is contained in:
zhanghongqing
2018-12-23 18:09:29 +08:00
parent 27b18c9901
commit 8c7d1124a6
5 changed files with 251 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
View File

@@ -100,7 +100,7 @@ public class DashboardServiceController extends BaseRestController {
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
beginDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cal.getTime());
}
List<HashMap> resultList = dashboardService.getActionTrans(beginDate, endDate, searchAction);
List<HashMap> resultList = dashboardService.getActionTrans2(beginDate, endDate, searchAction);
if (resultList != null && resultList.size() > 0) {
list = resultList;
}
@@ -880,7 +880,7 @@ public class DashboardServiceController extends BaseRestController {
try {
// 带查询时间查询所有
List<HashMap> websiteChart = dashboardService.getDomainTrans(beginDate, endDate,domain,entranceId);
List<HashMap> websiteChart = dashboardService.getDomainTrans2(beginDate, endDate,domain,entranceId);
if (websiteChart != null && websiteChart.size() > 0) {
list = websiteChart;
}