From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 17:29:42 +0800
Subject: [PATCH] 1、根据江海调整，功能码92、A2的应答中的日期时间去除； 2、表阀一体机的开关阀上行数据（84、85）处理逻辑进行修改。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
index 273c54a..4934903 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
@@ -96,8 +96,8 @@
sv.saveRmOpenCloseValveLast(poLast);
}else{
//鏁版嵁搴撲腑瀛樺湪璇ユ帶鍒跺櫒鐨勫紑鍏抽榾鏁版嵁
- if(poLast.closeDt != null && poLast.clIcCardAddr != null && poLast.clIcCardNo != null){
- if(poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))
+ if(poLast.clOrderNo != null && poLast.clIcCardAddr != null && poLast.clIcCardNo != null){
+ if(poLast.clOrderNo.equals(dataCd85Vo.orderNo)
&& poLast.clIcCardAddr.equals(dataCd85Vo.icCardAddr)
&& poLast.clIcCardNo.equals(dataCd85Vo.icCardNo)){
//閲嶅涓婃姤锛屽師鍥犳槸涓嬭鏁版嵁澶勭悊鎱簡锛屽氨閲嶅涓婃姤浜�
@@ -116,20 +116,15 @@
if(poLast.lastHistoryId != null){
poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
if(poHistory != null){
- if(poHistory.openDt != null){
- //涓婇潰宸茬粡鍒ゆ柇浜唒oLast.openDt == null锛屾墍浠ユ澶勪竴鑸細鏄痯oHistory.openDt != null
- if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
+ if(poHistory.opOrderNo != null){
+ if(poHistory.opOrderNo.equals(dataCd85Vo.orderNo)){
//鍖归厤鎴愬姛
//褰撳墠鍏抽榾鏄師璁板綍涓紑闃�鐨勫搴斿叧闃�
this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV202404, dataCd85Vo, false) ;
sv.updateRmOpenCloseValveHistory(poHistory);
- }else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
- //鍖归厤澶辫触(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
- //鏈湴鏈�鏂版暟鎹腑鐨勫紑闃�鏃堕棿鏅氫簬褰撳墠鍏抽榾涓婃姤涓殑寮�闃�鏃堕棿锛岃鏄庢槸琛ユ姤
- this.dealSupplyReport() ;
}else{
//鍖归厤澶辫触
- //鏈湴鏈�鏂版暟鎹腑鐨勫紑闃�鏃堕棿鏃╀簬褰撳墠鍏抽榾涓婃姤涓殑寮�闃�鏃堕棿锛岃鏄庢槸鏂扮殑涓�娆″叧闃�鎶ワ紝鑰屼笖瀵瑰簲鍏抽榾鎶ョ殑涓婁竴娆″紑闃�鎶ユ湭鏀跺埌
+ //褰撳墠鍏抽榾涓嶆槸鍘熻褰曚腑寮�闃�鐨勫搴斿叧闃�锛岃鏄庢槸鏂扮殑涓�娆″叧闃�鎶ワ紝鑰屼笖瀵瑰簲鍏抽榾鎶ョ殑涓婁竴娆″紑闃�鎶ユ湭鏀跺埌
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, true);
}
}else{
@@ -147,12 +142,9 @@
}
}
}else if(poLast.opType != null){
- //鍘熻褰曞瓨鍦ㄥ叧闃�鏁版嵁锛屼篃瀛樺湪寮�闃�鏁版嵁锛岄鍏堣繘琛屽紑鍏抽榾鏃堕棿瀵规瘮
- if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
+ //鍘熻褰曞瓨鍦ㄥ叧闃�鏁版嵁锛屼篃瀛樺湪寮�闃�鏁版嵁锛岄鍏堣繘琛屽姣�
+ if(poLast.clOrderNo != null && poLast.clOrderNo.equals(dataCd85Vo.orderNo)){
//閲嶅涓婃姤浜嗭紝涓嶈繘琛屽鐞�
- }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
- //琛ユ姤鐨勮涔呬箣鍓嶇殑鏁版嵁(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
- this.dealSupplyReport() ;
}else {
//鏄柊鐨勪笂鎶ュ叧闃�鏁版嵁
//杩涜鍘嗗彶鏁版嵁鍖归厤
@@ -160,14 +152,19 @@
if(poLast.lastHistoryId != null) {
poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId);
if (poHistory != null) {
- if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
- //鍖归厤涓婁簡
- this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV202404, dataCd85Vo, false) ;
- sv.updateRmOpenCloseValveHistory(poHistory);
+ if(poHistory.clOrderNo.equals(dataCd85Vo.orderNo)){
+ //閲嶅涓婃姤浜嗭紝涓嶈繘琛屽鐞�
}else{
- //涓婁釜鍏抽榾鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
- this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
+ if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
+ //閲嶅涓婃姤浜嗭紝涓嶈繘琛屽鐞�
+ }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
+ //琛ユ姤鐨勮涔呬箣鍓嶇殑鏁版嵁(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
+ this.dealSupplyReport() ;
+ }else {
+ //涓婁釜寮�闃�鎶ユ湭涓婃姤
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
+ this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
+ }
}
}else{
//杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
--
Gitblit v1.8.0