|
|
|
@@ -505,27 +505,40 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
historymap.put(date.substring(5).replace("-", "/"), o); |
|
|
|
} |
|
|
|
} |
|
|
|
Map<String, Object> datamap = new HashMap<>(); |
|
|
|
datamap.put("history", historymap); |
|
|
|
|
|
|
|
// 查询近一周的缴费车辆----start------ |
|
|
|
HashMap<Object, Object> weekParams = new HashMap<>(); |
|
|
|
weekParams.put("tenantId", tenantId); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
List<Date> days = DateUtils.dateToWeek(new Date()); |
|
|
|
String oneWeekStartdate = sdf.format(days.get(0)); |
|
|
|
String oneWeekEndDate = sdf.format(days.get(days.size()-1)); |
|
|
|
params.put("startdate", oneWeekStartdate + " 00:00:00"); |
|
|
|
params.put("enddate", oneWeekEndDate + " 23:59:59"); |
|
|
|
weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); |
|
|
|
weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); |
|
|
|
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); |
|
|
|
|
|
|
|
List<Map<String, Object>> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(params); |
|
|
|
List<Map<String, Object>> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(weekParams); |
|
|
|
Map<Object, Object> oneWeekCollect = oneWeekHistorylist.stream().collect(Collectors.toMap(m -> { |
|
|
|
return m.get("create_date"); |
|
|
|
}, m -> { |
|
|
|
return m.get("carcount"); |
|
|
|
})); |
|
|
|
historymap.put("oneWeekCarCount",oneWeekCollect.get("carcount")); |
|
|
|
historymap.put("oneWeekCarCount",oneWeekCollect.get("carcount")); |
|
|
|
// 查询近一周的缴费车辆----end------ |
|
|
|
datamap.put("oneWeekCarPayCount",oneWeekCollect.get("carcount")==null?0:oneWeekCollect.get("carcount")); |
|
|
|
|
|
|
|
Map<String, Object> datamap = new HashMap<>(); |
|
|
|
datamap.put("history", historymap); |
|
|
|
// 近一周缴费金额 |
|
|
|
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); |
|
|
|
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); |
|
|
|
Map<Object, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { |
|
|
|
return m.get("create_time"); |
|
|
|
}, m -> { |
|
|
|
return m.get("carcount"); |
|
|
|
})); |
|
|
|
TreeMap<Object, Object> weekMap = new TreeMap<>(); |
|
|
|
weekMap.putAll(weekCollect); |
|
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
|
// 查询近一周的缴费车辆----end------ |
|
|
|
|
|
|
|
//今日车流量 |
|
|
|
long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); |
|
|
|
|