From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 bfbc261..89c2c9f 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
@@ -16,8 +16,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; // 抢号
@@ -36,7 +34,7 @@
private BigDecimal loss_of_charging_degree; // 计损充电度数，精确到小数点后四位；待机置零，未设置计损比例时等于充电度数
private BigDecimal paid_amount; // 已充金额，精确到小数点后四位；待机置零（电费+服务费）*计损充电度数
private Integer hardware_fault; // 硬件故障（1：急停按钮动作故障；2：无可用整流模块；3：出风口温度过高；4：交流防雷故障；5：交直流模块 DC20 通信中断；6：绝缘检测模块 FC08 通信中断；7：电度表通信中断；8：读卡器通信中断；9：RC10 通信中断；10：风扇调速板故障；11：直流熔断器故障；12：高压接触器故障；13：门打开）
-
+ private String createTime; // 格式化时间格式
private BigDecimal electrovalence_all;// @ApiModelProperty("时段电价")
private BigDecimal service_charge;//@ApiModelProperty("时段服务费单价")
@@ -45,6 +43,8 @@
private BigDecimal period_service_price;// @ApiModelProperty("时段服务费")
+ private BigDecimal period_charging_degree;// @ApiModelProperty("时段充电度数")
+
}
--
Gitblit v1.7.1