From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
index 82129ee..11c40de 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
@@ -31,55 +31,161 @@
private Integer stop_reason;// 停止原因
private String physical_card_number;// 物理卡号
private String time1;// 计费时段
- private BigDecimal sharp_peak_charge1;// 电量
- private BigDecimal loss_sharp_peak_charge1;// 计损电量
- private BigDecimal sharp_peak_amount1;// 金额
+ private BigDecimal sharp_peak_charge1;// 尖电量
+ private BigDecimal loss_sharp_peak_charge1;// 计损尖电量
+ private BigDecimal sharp_peak_amount1;// 尖金额
+ private BigDecimal flat_peak_charge1;// 平电量
+ private BigDecimal loss_flat_peak_char1;// 计损平电量
+ private BigDecimal flat_peak_amount1;// 平金额
+ private BigDecimal peak_charge1;// 峰电量
+ private BigDecimal loss_peak_charge1;// 计损峰电量
+ private BigDecimal peak_amount1;// 峰金额
+ private BigDecimal low_peak_charge1;// 谷电量
+ private BigDecimal loss_low_peak_charge1;// 计损谷电量
+ private BigDecimal low_peak_amount1;// 谷金额
private String time2;// 计费时段
private BigDecimal sharp_peak_charge2;// 电量
private BigDecimal loss_sharp_peak_charge2;// 计损电量
private BigDecimal sharp_peak_amount2;// 金额
+ private BigDecimal flat_peak_charge2;// 电量
+ private BigDecimal loss_flat_peak_char2;// 计损电量
+ private BigDecimal flat_peak_amount2;// 金额
+ private BigDecimal peak_charge2;// 电量
+ private BigDecimal loss_peak_charge2;// 计损电量
+ private BigDecimal peak_amount2;// 金额
+ private BigDecimal low_peak_charge2;// 电量
+ private BigDecimal loss_low_peak_charge2;// 计损电量
+ private BigDecimal low_peak_amount2;// 金额
private String time3;// 计费时段
private BigDecimal sharp_peak_charge3;// 电量
private BigDecimal loss_sharp_peak_charge3;// 计损电量
private BigDecimal sharp_peak_amount3;// 金额
+ private BigDecimal flat_peak_charge3;// 电量
+ private BigDecimal loss_flat_peak_char3;// 计损电量
+ private BigDecimal flat_peak_amount3;// 金额
+ private BigDecimal peak_charge3;// 电量
+ private BigDecimal loss_peak_charge3;// 计损电量
+ private BigDecimal peak_amount3;// 金额
+ private BigDecimal low_peak_charge3;// 电量
+ private BigDecimal loss_low_peak_charge3;// 计损电量
+ private BigDecimal low_peak_amount3;// 金额
private String time4;// 计费时段
private BigDecimal sharp_peak_charge4;// 电量
private BigDecimal loss_sharp_peak_charge4;// 计损电量
private BigDecimal sharp_peak_amount4;// 金额
+ private BigDecimal flat_peak_charge4;// 电量
+ private BigDecimal loss_flat_peak_char4;// 计损电量
+ private BigDecimal flat_peak_amount4;// 金额
+ private BigDecimal peak_charge4;// 电量
+ private BigDecimal loss_peak_charge4;// 计损电量
+ private BigDecimal peak_amount4;// 金额
+ private BigDecimal low_peak_charge4;// 电量
+ private BigDecimal loss_low_peak_charge4;// 计损电量
+ private BigDecimal low_peak_amount4;// 金额
private String time5;// 计费时段
private BigDecimal sharp_peak_charge5;// 电量
private BigDecimal loss_sharp_peak_charge5;// 计损电量
private BigDecimal sharp_peak_amount5;// 金额
+ private BigDecimal flat_peak_charge5;// 电量
+ private BigDecimal loss_flat_peak_char5;// 计损电量
+ private BigDecimal flat_peak_amount5;// 金额
+ private BigDecimal peak_charge5;// 电量
+ private BigDecimal loss_peak_charge5;// 计损电量
+ private BigDecimal peak_amount5;// 金额
+ private BigDecimal low_peak_charge5;// 电量
+ private BigDecimal loss_low_peak_charge5;// 计损电量
+ private BigDecimal low_peak_amount5;// 金额
private String time6;// 计费时段
private BigDecimal sharp_peak_charge6;// 电量
private BigDecimal loss_sharp_peak_charge6;// 计损电量
private BigDecimal sharp_peak_amount6;// 金额
+ private BigDecimal flat_peak_charge6;// 电量
+ private BigDecimal loss_flat_peak_char6;// 计损电量
+ private BigDecimal flat_peak_amount6;// 金额
+ private BigDecimal peak_charge6;// 电量
+ private BigDecimal loss_peak_charge6;// 计损电量
+ private BigDecimal peak_amount6;// 金额
+ private BigDecimal low_peak_charge6;// 电量
+ private BigDecimal loss_low_peak_charge6;// 计损电量
+ private BigDecimal low_peak_amount6;// 金额
private String time7;// 计费时段
private BigDecimal sharp_peak_charge7;// 电量
private BigDecimal loss_sharp_peak_charge7;// 计损电量
private BigDecimal sharp_peak_amount7;// 金额
+ private BigDecimal flat_peak_charge7;// 电量
+ private BigDecimal loss_flat_peak_char7;// 计损电量
+ private BigDecimal flat_peak_amount7;// 金额
+ private BigDecimal peak_charge7;// 电量
+ private BigDecimal loss_peak_charge7;// 计损电量
+ private BigDecimal peak_amount7;// 金额
+ private BigDecimal low_peak_charge7;// 电量
+ private BigDecimal loss_low_peak_charge7;// 计损电量
+ private BigDecimal low_peak_amount7;// 金额
private String time8;// 计费时段
private BigDecimal sharp_peak_charge8;// 电量
private BigDecimal loss_sharp_peak_charge8;// 计损电量
private BigDecimal sharp_peak_amount8;// 金额
+ private BigDecimal flat_peak_charge8;// 电量
+ private BigDecimal loss_flat_peak_char8;// 计损电量
+ private BigDecimal flat_peak_amount8;// 金额
+ private BigDecimal peak_charge8;// 电量
+ private BigDecimal loss_peak_charge8;// 计损电量
+ private BigDecimal peak_amount8;// 金额
+ private BigDecimal low_peak_charge8;// 电量
+ private BigDecimal loss_low_peak_charge8;// 计损电量
+ private BigDecimal low_peak_amount8;// 金额
private String time9;// 计费时段
private BigDecimal sharp_peak_charge9;// 电量
private BigDecimal loss_sharp_peak_charge9;// 计损电量
private BigDecimal sharp_peak_amount9;// 金额
+ private BigDecimal flat_peak_charge9;// 电量
+ private BigDecimal loss_flat_peak_char9;// 计损电量
+ private BigDecimal flat_peak_amount9;// 金额
+ private BigDecimal peak_charge9;// 电量
+ private BigDecimal loss_peak_charge9;// 计损电量
+ private BigDecimal peak_amount9;// 金额
+ private BigDecimal low_peak_charge9;// 电量
+ private BigDecimal loss_low_peak_charge9;// 计损电量
+ private BigDecimal low_peak_amount9;// 金额
private String time10;// 计费时段
private BigDecimal sharp_peak_charge10;// 电量
private BigDecimal loss_sharp_peak_charge10;// 计损电量
private BigDecimal sharp_peak_amount10;// 金额
+ private BigDecimal flat_peak_charge10;// 电量
+ private BigDecimal loss_flat_peak_char10;// 计损电量
+ private BigDecimal flat_peak_amount10;// 金额
+ private BigDecimal peak_charge10;// 电量
+ private BigDecimal loss_peak_charge10;// 计损电量
+ private BigDecimal peak_amount10;// 金额
+ private BigDecimal low_peak_charge10;// 电量
+ private BigDecimal loss_low_peak_charge10;// 计损电量
+ private BigDecimal low_peak_amount10;// 金额
private String time11;// 计费时段
private BigDecimal sharp_peak_charge11;// 电量
private BigDecimal loss_sharp_peak_charge11;// 计损电量
private BigDecimal sharp_peak_amount11;// 金额
+ private BigDecimal flat_peak_charge11;// 电量
+ private BigDecimal loss_flat_peak_char11;// 计损电量
+ private BigDecimal flat_peak_amount11;// 金额
+ private BigDecimal peak_charge11;// 电量
+ private BigDecimal loss_peak_charge11;// 计损电量
+ private BigDecimal peak_amount11;// 金额
+ private BigDecimal low_peak_charge11;// 电量
+ private BigDecimal loss_low_peak_charge11;// 计损电量
+ private BigDecimal low_peak_amount11;// 金额
private String time12;// 计费时段
private BigDecimal sharp_peak_charge12;// 电量
private BigDecimal loss_sharp_peak_charge12;// 计损电量
private BigDecimal sharp_peak_amount12;// 金额
-
-
+ private BigDecimal flat_peak_charge12;// 电量
+ private BigDecimal loss_flat_peak_char12;// 计损电量
+ private BigDecimal flat_peak_amount12;// 金额
+ private BigDecimal peak_charge12;// 电量
+ private BigDecimal loss_peak_charge12;// 计损电量
+ private BigDecimal peak_amount12;// 金额
+ private BigDecimal low_peak_charge12;// 电量
+ private BigDecimal loss_low_peak_charge12;// 计损电量
+ private BigDecimal low_peak_amount12;// 金额
}
--
Gitblit v1.7.1