From e81d87a6c5f988a6d0fd77726fdd56b3076289a4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 28 十月 2024 11:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
index 58d5b85..1aa0de1 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
@@ -18,6 +18,8 @@
@Document(collection = "upload_real_time_monitoring_data") //指定要对应的文档名（表名）
@Accessors(chain = true)
public class UploadRealTimeMonitoringData extends BaseModel {
+ @Id
+ private String id;
private String transaction_serial_number; // 交易流水号
private String charging_pile_code; // 桩编码
private String charging_gun_code; // 抢号
@@ -48,6 +50,16 @@
private BigDecimal period_charging_degree;// @ApiModelProperty("时段充电度数")
+
+
+
+ private BigDecimal total_period_electric_price;// @ApiModelProperty("累计电费")
+
+ private BigDecimal total_period_service_price;// @ApiModelProperty("累计服务费")
+
+ private BigDecimal total_period_charging_degree;// @ApiModelProperty("累计充电量")
+
+
private Integer orderType; //1=充电订单（小程序），2=充电订单（刷卡））
private Integer siteId;
private Integer status; //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）"
--
Gitblit v1.7.1