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

1、修改流量统计趋势图接口，调整返回数据格式，以适应时间轴自动格式化的需求；

Browse Source 
2、趋势图时间粒度提取到nis.properties中，默认5分钟
This commit is contained in:
zhangdongxu
2019-01-03 15:38:57 +08:00
parent 75578bc44b
commit c58825df97
4 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -878,11 +878,11 @@ public class DashboardServiceController extends BaseRestController {
long start = System.currentTimeMillis();
AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request,
null);
List<HashMap> list = new ArrayList<HashMap>();
List list = new ArrayList();
try {
// 带查询时间查询所有
List<HashMap> websiteChart = dashboardService.getDomainTrans2(beginDate, endDate,domain,entranceId);
List websiteChart = dashboardService.getDomainTrans2(beginDate, endDate,domain,entranceId);
if (websiteChart != null && websiteChart.size() > 0) {
list = websiteChart;
}
@@ -959,7 +959,7 @@ public class DashboardServiceController extends BaseRestController {
AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request,
null);
Map<String, List> restMap = new HashMap<String, List>();
Map restMap = new HashMap();
try {
// 验证serachBusinessType
if (!StringUtil.isBlank(ntcConnNumReport.getSearchBusinessType())