From 75347649fb44f0a6064be55f093dea884c895930 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 17 五月 2025 09:57:36 +0800
Subject: [PATCH] 先上行关闭报，后上行开阀报，此种情况，历史数据赋值补充几个遗失的属性值
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 3 +++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index d47352a..c90f0a0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -458,6 +458,9 @@
this.opIcCardNo = dataCd84Vo.icCardNo;
this.opIcCardAddr = dataCd84Vo.icCardAddr;
this.opRemainMoney = dataCd84Vo.moneyRemainUser;
+ this.opOrderNo = dataCd84Vo.orderNo; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = dataCd84Vo.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = dataCd84Vo.waterRemainUser; //姹熸捣鍗忚鐗规湁
this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.openDt);
if (clearCloseValve != null && clearCloseValve.booleanValue()) {
this.clDt = null;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
index 8b8554f..5694c52 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
@@ -103,7 +103,7 @@
}
}
if(poLast.opType != null){
- //鍘熻褰曞瓨鍦ㄥ紑闃�鏁版嵁锛岄鍏堣繘琛屾椂闂村姣�
+ //鍘熻褰曞瓨鍦ㄥ紑闃�鏁版嵁锛岄鍏堣繘琛岃鍗曞彿瀵规瘮
if(poLast.opOrderNo != null && poLast.opOrderNo.equals(dataCd84Vo.orderNo)){
//閲嶅涓婃姤鐨勫紑闃�鏁版嵁锛屼笉杩涜澶勭悊
}else if(poLast.openDt != null && poLast.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.openDt))){
@@ -116,7 +116,7 @@
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dataV202404, dataCd84Vo, poLast);
}
}else if(poLast.clType != null){
- //鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁锛屼絾瀛樺湪鍏抽榾鏁版嵁锛岄鍏堣繘琛屾椂闂存瘮瀵�
+ //鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁锛屼絾瀛樺湪鍏抽榾鏁版嵁锛岄鍏堣繘琛岃鍗曞彿姣斿
if(poLast.clOrderNo != null && poLast.clOrderNo.equals(dataCd84Vo.orderNo)){
//褰撳墠涓婃姤鐨勫紑闃�鏁版嵁涓庡師鏉ョ殑鍏抽榾鏁版嵁鍖归厤
RmOpenCloseValveHistory poHistory = null ;
@@ -253,7 +253,7 @@
poHistory.controllerId = controller==null?null:controller.getId();
poHistory.intakeId = controller==null?null:controller.getIntakeId();
poHistory.rtuAddr = rtuAddr;
- poHistory.updateFrom(dataV202404, dataCd84Vo, false);
+ poHistory.updateFrom(dataV202404, dataCd84Vo, clearLastCloseValve);
}
}
}
--
Gitblit v1.8.0