From ee243ee6a7cd9715fa84442e27b17816750033b5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 11:57:28 +0800
Subject: [PATCH] 部分VO中增加json中的属性排序
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
index 4fd16a1..201e539 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
@@ -137,7 +137,7 @@
}
/**
- * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鏈�鏂拌褰�
+ * 鐢熸垚鏂扮殑鍙栨按鍙ｇ敤姘寸粺璁℃渶鏂拌褰�
* @param controller
* @param rtuAddr
* @param dV1
@@ -153,13 +153,21 @@
po.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
po.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
po.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
- po.amount = 0.0D ;
+ if(cdData.isCloseValve != null && cdData.isCloseValve){
+ po.amount = cdData.amount ;
+ po.money = cdData.money ;
+ po.times = 1 ;
+ }else{
+ po.amount = 0.0D ;
+ po.money = 0.0D ;
+ po.times = 0 ;
+ }
po.rtuAddrLast = rtuAddr;
return po ;
}
/**
- * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鍘嗗彶璁板綍
+ * 鐢熸垚鏂扮殑鍙栨按鍙ｇ敤姘寸粺璁″巻鍙茶褰�
* @param controller
* @param rtuAddr
* @param dV1
@@ -177,8 +185,12 @@
po.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
if(lastPo != null){
po.amount = lastPo.amount ;
+ po.money = lastPo.money ;
+ po.times = lastPo.times ;
}else{
po.amount = 0.0D ;
+ po.money = 0.0D ;
+ po.times = 0 ;
}
po.totalAmountLast = cdData.totalAmount ;
return po ;
@@ -206,7 +218,7 @@
/**
- * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鏈�鏂拌褰�
+ * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣紝姝ゆ椂鍙洿鏂伴儴鍒嗗睘鎬�
* @param controller
* @param rtuAddr
* @param dV1
@@ -227,7 +239,7 @@
}
/**
- * 鏇存柊鏈�鏂拌褰�
+ * 鏀跺埌鍚屼竴澶╃殑鏂扮殑鏁版嵁锛岃繘琛屾洿鏂版暟鎹�
* @param controller
* @param rtuAddr
* @param dV1
@@ -262,6 +274,22 @@
//鏈缃噺鍊间笉鍙橈紝涓嬫鍐嶄笂鎶ユ椂锛屽氨鑳芥甯歌绠椾簡銆�
//lastPo.amount = lastPo.amount ; //鏃ョ疮璁″彇姘撮噺涓嶅彉
}
+ if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
+ //鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
+ if(lastPo.money == null){
+ lastPo.money = cdData.money ;
+ }else{
+ lastPo.money += cdData.money ;
+ }
+ if(lastPo.times == null){
+ lastPo.times = 1 ;
+ }else{
+ lastPo.times += 1 ;
+ }
+ }else{
+ lastPo.money = 0.0D ;
+ lastPo.times = 1 ;
+ }
lastPo.totalAmountLast = cdData.totalAmount ;
}
@@ -269,7 +297,7 @@
}
/**
- * 鏇存柊鏈�鏂拌褰�
+ * 鍥犳敹鍒版柊鐨勪竴澶╃殑鏂扮殑鏁版嵁鍚庯紝杩涜鏇存柊鏁版嵁
* @param controller
* @param rtuAddr
* @param dV1
@@ -304,12 +332,20 @@
lastPo.totalAmountLast = cdData.totalAmount ;
}
+ if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
+ //鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
+ lastPo.money = cdData.money ;
+ lastPo.times = 1 ;
+ }else{
+ lastPo.money = 0.0D ;
+ lastPo.times = 0 ;
+ }
return lastPo ;
}
/**
- * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鏈�鏂拌褰�
+ * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣ㄥ湪锛屾鏃跺彧鏇存柊閮ㄥ垎灞炴��
* @param controller
* @param rtuAddr
* @param dV1
@@ -326,6 +362,8 @@
po.rtuDtLast = lastPo.rtuDtLast;
po.amount = lastPo.amount ;
+ po.money = lastPo.money ;
+ po.times = lastPo.times ;
po.totalAmountLast = lastPo.totalAmountLast ;
return po ;
@@ -349,6 +387,8 @@
po.rtuDtLast = lastPo.rtuDtLast;
po.amount = lastPo.amount ;//姝ゆ椂lastPo.amount宸茬粡澧炲姞涓婁簡澧為噺
+ po.money = lastPo.money ;//姝ゆ椂lastPo.money宸茬粡澧炲姞涓婁簡澧為噺
+ po.times = lastPo.times ;//姝ゆ椂lastPo.times宸茬粡澧炲姞涓婁簡澧為噺
po.totalAmountLast = lastPo.totalAmountLast ;
return po ;
@@ -357,6 +397,9 @@
public class UpDataVo{
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ public Double amount; //鍐滄埛鐢ㄦ按閲�
+ public Double money ;//鍐滄埛娑堣垂閲戦
+ public Boolean isCloseValve ;//鏄惁鏄叧闃�涓婃姤
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
public void valueFrom(DataCdC0Vo voC0, DataCd84Vo vo84, DataCd83OpenVo vo83Op, DataCd83CloseVo vo83Cl){
@@ -371,6 +414,9 @@
this.rtuDt = vo83Op.rtuDt ;
}else if(vo83Cl != null){
this.totalAmount = vo83Cl.totalAmount ;
+ this.amount = vo83Cl.thisAmount ;
+ this.money = vo83Cl.thisMoney ;
+ this.isCloseValve = true ;
this.rtuDt = vo83Cl.rtuDt ;
}
}
--
Gitblit v1.8.0