From 68cdd1ca0cf5dbc1f61cdc2a633b36473eccad2d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 19 +++++++++++++++++++
1 files changed, 19 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 28b7ba4..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
@@ -7,6 +7,8 @@
import org.springframework.data.mongodb.core.mapping.Document;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 上传实时监测数据
@@ -17,6 +19,7 @@
@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; // 抢号
@@ -25,6 +28,7 @@
private Integer insertion_status; // 是否插枪（0：否，1：是）
private BigDecimal output_voltage; // 输出电压，精确到小数点后一位；待机置零
private BigDecimal output_current; // 输出电流，精确到小数点后一位；待机置零
+ private BigDecimal power; // 功率
private Integer gun_line_temperature; // 枪线温度，整形，偏移量-50；待机置零
private String gun_line_code; // 枪线编码，没有置零
private Integer soc; // SOC待机置零；交流桩置零
@@ -47,6 +51,21 @@
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=已结束）"
+ private LocalDateTime startTime; //充电开始时间
+ private LocalDateTime endTime; //充电结束时间
+
}
--
Gitblit v1.7.1