From 091d43e8088ec538788ae3335a085ac7103b0d2d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 18:25:02 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..e00f706 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;
/**
* 上传实时监测数据
@@ -16,7 +18,6 @@
@Document(collection = "upload_real_time_monitoring_data") //指定要对应的文档名（表名）
@Accessors(chain = true)
public class UploadRealTimeMonitoringData extends BaseModel {
- @Id
private String transaction_serial_number; // 交易流水号
private String charging_pile_code; // 桩编码
private String charging_gun_code; // 抢号
@@ -46,6 +47,11 @@
private BigDecimal 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