From c34f00fceeb5a66d1bf1113bdba707676d35109d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 11:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java | 19 +++++++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 26 ++++++++++++++------------
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java
index ccd33d4..a3bcc44 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java
@@ -199,6 +199,25 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
+ @ApiModelProperty(value = "站点名称")
+ private String siteName;
+ @ApiModelProperty(value = "充电终端名称 桩+枪")
+ private String terminalName;
+ @ApiModelProperty(value = "充电时间 秒")
+ private Long chargingSecond;
+ @ApiModelProperty(value = "平台手续费")
+ private BigDecimal platFormMoney;
+ @ApiModelProperty(value = "三方平台分佣")
+ private BigDecimal commission;
+ @ApiModelProperty(value = "车牌号")
+ private String licensePlate;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+
+ @ApiModelProperty(value = "时段数")
+ private Integer count;
+
}
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..6f1dfab 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);
}
--
Gitblit v1.7.1