|
|
|
@@ -512,10 +512,8 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
// 查询近一周的缴费车辆----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)); |
|
|
|
String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); |
|
|
|
String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date());; |
|
|
|
weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); |
|
|
|
weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); |
|
|
|
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); |
|
|
|
@@ -530,26 +528,16 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
}, m -> { |
|
|
|
return m.get("fee"); |
|
|
|
})); |
|
|
|
List<String> days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0"); |
|
|
|
|
|
|
|
TreeMap<String, Object> weekMap = new TreeMap<>(); |
|
|
|
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd"); |
|
|
|
for (Date date:days) { |
|
|
|
weekMap.put(sdfForWeek.format(date),"0"); |
|
|
|
for (String date:days) { |
|
|
|
weekMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
|
} |
|
|
|
for (String key : weekCollect.keySet()) { |
|
|
|
weekMap.put(key,weekCollect.get(key)); |
|
|
|
} |
|
|
|
|
|
|
|
TreeMap<String, Object> weekResultMap = new TreeMap<>(); |
|
|
|
int count = 1; |
|
|
|
for (String key : weekMap.keySet()) { |
|
|
|
if(count == 7){ |
|
|
|
weekResultMap.put("日",weekMap.get(key)); |
|
|
|
}else{ |
|
|
|
weekResultMap.put(count+"",weekMap.get(key)); |
|
|
|
} |
|
|
|
count++; |
|
|
|
} |
|
|
|
datamap.put("oneWeekCarPayFeeCount",weekResultMap); |
|
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
|
// 查询近一周的缴费车辆----end------ |
|
|
|
|
|
|
|
//今日车流量 |
|
|
|
|