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/BmsDemandAndChargerExportation.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
index d9d2b83..917a20f 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
@@ -2,6 +2,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import java.math.BigDecimal;
@@ -13,8 +14,7 @@
@Data
@Document(collection = "bms_demand_and_charger_exportation") //指定要对应的文档名（表名）
@Accessors(chain = true)
-public class BmsDemandAndChargerExportation {
-
+public class BmsDemandAndChargerExportation extends BaseModel {
private String transaction_serial_number; // 交易流水号
private String charging_pile_code; // 桩编码
private String charging_gun_code; // 抢号
@@ -25,10 +25,10 @@
private BigDecimal bms_current_measurement_value; // BMS 充电电流测量值
private Integer bms_battery_voltage_and_group_number; // BMS 最高单体动力蓄电池电压及组号（1-12 位：最高单体动力蓄电池电压，数据分辨率：0.01 V/位，0 V 偏移量；数据范围：0~24 V；13-16 位：最高单体动力蓄电池电压所在组号，数据分辨率：1/位，0 偏移量；数据范围：0~15）
private BigDecimal bms_charged_status; // BMS 当前荷电状态 SOC（ %）
- private Integer bms_remaining_charging_time; // BMS 估算剩余充电时间
+ private BigDecimal bms_remaining_charging_time; // BMS 估算剩余充电时间
private BigDecimal voltage_output_value; // 电桩电压输出值
private BigDecimal current_output_value; // 电桩电流输出值
- private Integer cumulative_charging_time; // 累计充电时间
+ private BigDecimal cumulative_charging_time; // 累计充电时间
}
--
Gitblit v1.7.1