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

阻断监测统计接口 修改五分钟粒度 数据返回日期格式

Browse Source
This commit is contained in:
李皓宸
2019-06-21 15:53:08 +08:00
parent 1daea74036
commit 8e15b0b019
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/service/restful/TrafficReportService.java
View File

@@ -320,12 +320,17 @@ public class TrafficReportService extends BaseLogService {
// entrance1.addAll(entrance2);
if (!StringUtil.isEmpty(entrance1)) {
// Map<String, Comparable> m = new HashMap<String, Comparable>();
Date beginDate = DateUtils.parseDate(begin);
Date endDate = DateUtils.parseDate(end);
// Date beginDate = ;
Long beginDate = DateUtils.getTimeByType(DateUtils.parseDate(begin).getTime(),
(Integer.valueOf(searchBusinessType) - 1));
Long endDate = DateUtils.getTimeByType(DateUtils.parseDate(end).getTime(),
(Integer.valueOf(searchBusinessType) - 1));
Date endDateTimes = new Date(endDate);
List<Date> dateRangeList = new ArrayList<Date>();
Calendar calendar = Calendar.getInstance();
calendar.setTime(beginDate);
calendar.setTime(new Date(beginDate));
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
int trend_time_interval = 0;
int unit = 0;
@@ -345,7 +350,7 @@ public class TrafficReportService extends BaseLogService {
unit = Calendar.YEAR;
trend_time_interval = 1;
}
while (calendar.getTime().compareTo(endDate) < 0) {
while (calendar.getTime().compareTo(endDateTimes) < 0) {
dateRangeList.add(calendar.getTime());
calendar.add(unit, trend_time_interval);
}