|
|
|
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.atomic.AtomicInteger; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
@@ -529,7 +530,7 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
}, m -> { |
|
|
|
return m.get("fee"); |
|
|
|
})); |
|
|
|
TreeMap<Object, Object> weekMap = new TreeMap<>(); |
|
|
|
TreeMap<String, Object> weekMap = new TreeMap<>(); |
|
|
|
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd"); |
|
|
|
for (Date date:days) { |
|
|
|
weekMap.put(sdfForWeek.format(date),"0"); |
|
|
|
@@ -537,7 +538,18 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
for (String key : weekCollect.keySet()) { |
|
|
|
weekMap.put(key,weekCollect.get(key)); |
|
|
|
} |
|
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
|
|
|
|
|
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); |
|
|
|
// 查询近一周的缴费车辆----end------ |
|
|
|
|
|
|
|
//今日车流量 |
|
|
|
|