|
@@ -213,6 +213,8 @@ public class JiaoYangDingPanController extends BaseController {
|
|
requestMap.put("date", DateUtils.strDateToInt(lastDate));
|
|
requestMap.put("date", DateUtils.strDateToInt(lastDate));
|
|
List<JSONObject> yesterday = jiaoYangDingPanService.getGmvHours(requestMap);
|
|
List<JSONObject> yesterday = jiaoYangDingPanService.getGmvHours(requestMap);
|
|
JSONObject data = new JSONObject();
|
|
JSONObject data = new JSONObject();
|
|
|
|
+ completionTime(today, "charge");
|
|
|
|
+ completionTime(yesterday, "charge");
|
|
data.put("today", today);
|
|
data.put("today", today);
|
|
data.put("yesterday", yesterday);
|
|
data.put("yesterday", yesterday);
|
|
returnJson.put("code", 200);
|
|
returnJson.put("code", 200);
|
|
@@ -226,6 +228,48 @@ public class JiaoYangDingPanController extends BaseController {
|
|
return returnJson;
|
|
return returnJson;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 补全时辰
|
|
|
|
+ * 时辰补全
|
|
|
|
+ */
|
|
|
|
+ private void completionTime(List<JSONObject> dataList, String type) {
|
|
|
|
+ List<Integer> newDayList = new ArrayList<>();
|
|
|
|
+ for (JSONObject data : dataList) {
|
|
|
|
+ newDayList.add(data.getInteger("time"));
|
|
|
|
+ }
|
|
|
|
+ List<Integer> dayList = new ArrayList<>();
|
|
|
|
+
|
|
|
|
+ for (int i = 0; i <= 23; i++) {
|
|
|
|
+ dayList.add(i);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (Integer hour : dayList) {
|
|
|
|
+ if (!newDayList.contains(hour)) {
|
|
|
|
+ JSONObject obj = new JSONObject();
|
|
|
|
+ obj.put("time", hour);
|
|
|
|
+ obj.put(type, 0.00);
|
|
|
|
+ dataList.add(obj);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ statHourListSort(dataList);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //排序
|
|
|
|
+ private static void statHourListSort(List<JSONObject> list) {
|
|
|
|
+ Collections.sort(list, new Comparator<JSONObject>() {
|
|
|
|
+ @Override
|
|
|
|
+ public int compare(JSONObject o1, JSONObject o2) {
|
|
|
|
+ try {
|
|
|
|
+ Integer dt1 = o1.getInteger("time");
|
|
|
|
+ Integer dt2 = o2.getInteger("time");
|
|
|
|
+ return dt1.compareTo(dt2);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* 分团队数据
|
|
* 分团队数据
|