From e39865b79231c3716d320920e32b017ef5677c8f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 13:41:46 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 156 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
index 5d8eb09..b851bf4 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
@@ -19,22 +19,6 @@
private String charging_gun_code;// 抢号
private String start_time;// 开始时间
private String end_time;// 结束时间
- private BigDecimal sharp_peak_unit_price;// 尖单价
- private BigDecimal sharp_peak_charge;// 尖电量
- private BigDecimal loss_sharp_peak_charge;// 计损尖电量
- private BigDecimal sharp_peak_amount;// 尖金额
- private BigDecimal peak_unit_price;// 峰单价
- private BigDecimal peak_charge;// 峰电量
- private BigDecimal loss_peak_charge;// 计损峰电量
- private BigDecimal peak_amount;// 峰金额
- private BigDecimal flat_peak_unit_price;// 平单价
- private BigDecimal flat_peak_charge;// 平电量
- private BigDecimal loss_flat_peak_charge;// 计损平电量
- private BigDecimal flat_peak_amount;// 平金额
- private BigDecimal low_peak_unit_price;// 谷单价
- private BigDecimal low_peak_charge;// 谷电量
- private BigDecimal loss_low_peak_charge;// 计损谷电量
- private BigDecimal low_peak_amount;// 谷金额
private BigDecimal total_initial_value;// 电表总起值
private BigDecimal total_stop_value;// 电表总止值
private BigDecimal total_electricity;// 总电量
@@ -45,6 +29,162 @@
private String trade_date;// 交易日期、时间
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 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