|
|
|
@@ -859,7 +859,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
wxCarCmdLog.setCmdTypes(EnumCarCmd.getCarIn()); |
|
|
|
wxCarCmdLog.setStartdate(DateUtils.stringToDate(systemTime + " 05:00:00","yyyy-MM-dd HH:mm:ss")); |
|
|
|
wxCarCmdLog.setEnddate(new Date()); |
|
|
|
Map<String, Integer> todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
Map<String, Long> todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
|
|
|
|
List<String> hourList = new ArrayList<>(); |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
@@ -870,12 +870,13 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
for (int i = startHour; i < endHour; i++) { |
|
|
|
hourList.add(i < 10 ? "0" + i + ":00" : i + ":00"); |
|
|
|
} |
|
|
|
List<Object> todayCarList = new ArrayList<>(); |
|
|
|
List<Long> todayCarList = new ArrayList<>(); |
|
|
|
for (int i = startHour; i < endHour; i++) { |
|
|
|
if(i<hour) { |
|
|
|
todayCarList.add(todaycollect.get((Object) hourList.get(i-startHour))); |
|
|
|
Long count = todaycollect.get(hourList.get(i - startHour)); |
|
|
|
todayCarList.add(count == null?0l:count); |
|
|
|
} else { |
|
|
|
todayCarList.add(""); |
|
|
|
todayCarList.add(0l); |
|
|
|
} |
|
|
|
} |
|
|
|
datamap.put("currentimeindex", hourList); |
|
|
|
@@ -883,19 +884,21 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
|
|
|
|
wxCarCmdLog.setStartdate(DateUtils.stringToDate(yesterday + " 05:00:00","yyyy-MM-dd HH:mm:ss")); |
|
|
|
wxCarCmdLog.setEnddate(DateUtils.stringToDate(yesterday + " 22:59:59","yyyy-MM-dd HH:mm:ss")); |
|
|
|
Map<String, Integer> yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
List<Object> yesterdayCarList = new ArrayList<>(); |
|
|
|
Map<String, Long> yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
List<Long> yesterdayCarList = new ArrayList<>(); |
|
|
|
for (int i = startHour; i < endHour; i++) { |
|
|
|
yesterdayCarList.add(yesterdaycollect.get((Object) hourList.get(i-startHour))); |
|
|
|
Long count = yesterdaycollect.get(hourList.get(i - startHour)); |
|
|
|
yesterdayCarList.add(count == null?0l:count); |
|
|
|
} |
|
|
|
datamap.put("yesterdaycardata", yesterdayCarList); |
|
|
|
|
|
|
|
wxCarCmdLog.setStartdate(DateUtils.stringToDate(lastweek + " 05:00:00","yyyy-MM-dd HH:mm:ss")); |
|
|
|
wxCarCmdLog.setEnddate(DateUtils.stringToDate(lastweek + " 22:59:59","yyyy-MM-dd HH:mm:ss")); |
|
|
|
Map<String, Integer> lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
List<Object> lastweekdayCarList = new ArrayList<>(); |
|
|
|
Map<String, Long> lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); |
|
|
|
List<Long> lastweekdayCarList = new ArrayList<>(); |
|
|
|
for (int i = startHour; i < endHour; i++) { |
|
|
|
lastweekdayCarList.add(lastweekdaycollect.get((Object) hourList.get(i-startHour))); |
|
|
|
Long count = lastweekdaycollect.get(hourList.get(i - startHour)); |
|
|
|
lastweekdayCarList.add(count == null?0l:count); |
|
|
|
} |
|
|
|
datamap.put("lastdaycardata", lastweekdayCarList); |
|
|
|
|
|
|
|
|