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

默认时间改为一小时，只要不是闭区间都改为一小时；

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-23 21:10:23 +08:00
parent 2e30d562a5
commit 829be054fb
3 changed files with 62 additions and 9 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

@@ -922,9 +922,9 @@ public class DashboardServiceController extends BaseRestController {
cal.add(Calendar.HOUR_OF_DAY, -1);
beginDate = sdf.format(cal.getTime());
}else if((beginDate == null || "".equals(beginDate)) && (endDate != null && !"".equals(endDate))){
beginDate = DateUtils.getSpecifiedDayBefore(endDate)+" "+endDate.substring(11);
beginDate = DateUtils.getSpecifiedHourBefore(endDate);
}else if((endDate == null || "".equals(endDate)) && (beginDate != null && !"".equals(beginDate))){
endDate = DateUtils.getSpecifiedDayAfter(beginDate)+" "+beginDate.substring(11);
endDate = DateUtils.getSpecifiedHourAfter(beginDate);
}
// 带查询时间查询所有
List<Map> portActiveChart = dashboardService.findTrafficPortActive(beginDate, endDate,port);

2
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

@@ -1505,7 +1505,7 @@ public class DashboardService extends BaseService {
List<String> strDateRangeList = new ArrayList<String>();
Calendar calendar = Calendar.getInstance();
calendar.setTime(beginDate1);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
while (calendar.getTime().compareTo(endDate1)<=0) {
dateRangeList.add(calendar.getTime());
strDateRangeList.add(sdf.format(calendar.getTime()));