From ce41710ccaf1e841bd7bc0870d86bb30e0fa05da Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 21 十月 2024 13:43:00 +0800
Subject: [PATCH] marge
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index c38aabe..0c4df93 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -685,7 +685,7 @@
// dto.setUserIds(data);
// dto.setPageCurr(1);
// dto.setPageSize(99999);
-// TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
+
// Map<String,TChargingOrder> map = new HashMap<>();
// //吧list放入map中
// for (ChargingOrderVO record : res.getList().getRecords()) {
@@ -696,19 +696,21 @@
List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();
-// List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
-// for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
-// ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
-// BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
-// TChargingOrder tChargingOrder = map.get(uploadRealTimeMonitoringData.getCharging_pile_code());
-// if (tChargingOrder!=null) {
-// BeanUtils.copyProperties(tChargingOrder, dataDto);
-// }
-// dtos.add(dataDto);
-// }
+ List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
+ ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
+ BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
+ ChargingOrderQuery dto = new ChargingOrderQuery();
+ TCharingOrderVO vo = chargingOrderService.chargingOrder(dto);
+ ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
+ if (chargingOrderVO!=null) {
+ BeanUtils.copyProperties(chargingOrderVO, dataDto);
+ }
+ dtos.add(dataDto);
+ }
- return R.ok(data1);
+ return R.ok(dtos);
}
@@ -925,7 +927,39 @@
startDate = startDate.plusDays(1);
}
- tCharingUserMapVO.setMap(map);
+ tCharingUserMapVO.setMap(dateRangeStatistics);
+
+
+ List<Map<String,Object>> map1 = chargingOrderService.usersByQuery(statisticsQueryDto);
+
+
+
+
+ List<Map<String, Object>> dateRangeStatistics1 = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> dailyStats = findMapWithDateValue(map1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics1.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("counts", 0);
+ dateRangeStatistics1.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusDays(1);
+ }
+
+ tCharingUserMapVO.setMap1(dateRangeStatistics1);
+
+
+
+
}
//用户标签
--
Gitblit v1.7.1