From f2a57f2a9fa309f872d10c7fada992b63a0c0d5f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 27 十月 2024 20:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 58f341b..58d5b85 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
@@ -26,6 +26,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待机置零；交流桩置零
@@ -50,8 +51,8 @@
private Integer orderType; //1=充电订单（小程序），2=充电订单（刷卡））
private Integer siteId;
private Integer status; //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）"
- private Date startTime; //充电开始时间
- private Date endTime; //充电结束时间
+ private LocalDateTime startTime; //充电开始时间
+ private LocalDateTime endTime; //充电结束时间
}
--
Gitblit v1.7.1