From 2daa780ed9c74cb689f7c1e6a13f8aadebd57208 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 五月 2025 16:59:09 +0800
Subject: [PATCH] 表阀一体协议，修改域名及端口解析，适应空值情况。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealCloseValveReport.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealCloseValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealCloseValveReport.java
index b7426bd..4b52d81 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealCloseValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealCloseValveReport.java
@@ -121,7 +121,7 @@
if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
//鍖归厤鎴愬姛
//褰撳墠鍏抽榾鏄師璁板綍涓紑闃�鐨勫搴斿叧闃�
- this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
sv.updateRmOpenCloseValveHistory(poHistory);
}else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
//鍖归厤澶辫触(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
@@ -162,28 +162,28 @@
if (poHistory != null) {
if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
//鍖归厤涓婁簡
- this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
sv.updateRmOpenCloseValveHistory(poHistory);
}else{
//涓婁釜鍏抽榾鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
}
}else{
//杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
}
}else{
//杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
}
}
}else{
//if(po.opType == null)
//鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁涔熶笉瀛樺湪鍏抽榾鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛屼絾涓哄畨鍏ㄤ篃杩涜澶勭悊锛屼篃璁や负涓婁釜鍏抽榾鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍锛屾病鏈夊搴旂殑寮�鍙戞暟鎹�
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
}
@@ -291,6 +291,7 @@
*/
private void updateCloseValve(SeClient clientVo,
PrController controller,
+ String rtuAddr,
RmOpenCloseValveLast poLast,
RmOpenCloseValveHistory poHistory,
DataV1 dV1,
@@ -300,17 +301,15 @@
poLast.clientName = clientVo==null?null:clientVo.getName() ;
poLast.controllerId = controller==null?null:controller.getId();
poLast.intakeId = controller==null?null:controller.getIntakeId();
-
+ poLast.rtuAddr = rtuAddr;
poLast.updateFrom(dV1, dataCd83CloseVo, clearLastOpenValue);
-
if(poHistory != null){
poHistory.clientId = clientVo==null?null:clientVo.getId() ;
poHistory.clientName = clientVo==null?null:clientVo.getName() ;
poHistory.controllerId = controller==null?null:controller.getId();
poHistory.intakeId = controller==null?null:controller.getIntakeId();
-
+ poHistory.rtuAddr = rtuAddr;
poHistory.updateFrom(dV1, dataCd83CloseVo, false);
}
-
}
}
--
Gitblit v1.8.0