From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本；2、默认设备是表阀一体（0x02）
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
index 306b50d..894dd14 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
@@ -131,127 +131,127 @@
private void setValueOfDayOfMonth(Integer statisticsDay, VoClientConsumeStatistics vo, StConsumeClientDay po){
switch (statisticsDay) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
case 13:
- po.amount13 = vo.amount;
+ po.amount13 = vo.money;
po.times13 = vo.times;
break;
case 14:
- po.amount14 = vo.amount;
+ po.amount14 = vo.money;
po.times14 = vo.times;
break;
case 15:
- po.amount15 = vo.amount;
+ po.amount15 = vo.money;
po.times15 = vo.times;
break;
case 16:
- po.amount16 = vo.amount;
+ po.amount16 = vo.money;
po.times16 = vo.times;
break;
case 17:
- po.amount17 = vo.amount;
+ po.amount17 = vo.money;
po.times17 = vo.times;
break;
case 18:
- po.amount18 = vo.amount;
+ po.amount18 = vo.money;
po.times18 = vo.times;
break;
case 19:
- po.amount19 = vo.amount;
+ po.amount19 = vo.money;
po.times19 = vo.times;
break;
case 20:
- po.amount20 = vo.amount;
+ po.amount20 = vo.money;
po.times20 = vo.times;
break;
case 21:
- po.amount21 = vo.amount;
+ po.amount21 = vo.money;
po.times21 = vo.times;
break;
case 22:
- po.amount22 = vo.amount;
+ po.amount22 = vo.money;
po.times22 = vo.times;
break;
case 23:
- po.amount23 = vo.amount;
+ po.amount23 = vo.money;
po.times23 = vo.times;
break;
case 24:
- po.amount24 = vo.amount;
+ po.amount24 = vo.money;
po.times24 = vo.times;
break;
case 25:
- po.amount25 = vo.amount;
+ po.amount25 = vo.money;
po.times25 = vo.times;
break;
case 26:
- po.amount26 = vo.amount;
+ po.amount26 = vo.money;
po.times26 = vo.times;
break;
case 27:
- po.amount27 = vo.amount;
+ po.amount27 = vo.money;
po.times27 = vo.times;
break;
case 28:
- po.amount28 = vo.amount;
+ po.amount28 = vo.money;
po.times28 = vo.times;
break;
case 29:
- po.amount29 = vo.amount;
+ po.amount29 = vo.money;
po.times29 = vo.times;
break;
case 30:
- po.amount30 = vo.amount;
+ po.amount30 = vo.money;
po.times30 = vo.times;
break;
case 31:
- po.amount31 = vo.amount;
+ po.amount31 = vo.money;
po.times31 = vo.times;
break;
}
@@ -260,58 +260,58 @@
private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
switch (statisticsMonth) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
}
}
private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
- po.amount = vo.amount;
+ po.amount = vo.money;
po.times = vo.times;
}
}
--
Gitblit v1.8.0