From 02d965a2ff0cb5d415cedceacd2ae90c7ec1ac39 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 10 五月 2025 09:03:50 +0800
Subject: [PATCH] 解决开关阀记录数据因重绑定或改RTU地址而引起的地址变更问题
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java | 74 ++++--------------------------------
1 files changed, 9 insertions(+), 65 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 fc9b945..e983270 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
@@ -119,7 +119,7 @@
if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
//鍖归厤鎴愬姛
//褰撳墠鍏抽榾鏄師璁板綍涓紑闃�鐨勫搴斿叧闃�
- this.updateCloseValve(clientVo, controller, poLast, poHistory, dV202404, dataCd85Vo, false) ;
+ 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)
@@ -160,28 +160,28 @@
if (poHistory != null) {
if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
//鍖归厤涓婁簡
- this.updateCloseValve(clientVo, controller, poLast, poHistory, dV202404, dataCd85Vo, false) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV202404, dataCd85Vo, false) ;
sv.updateRmOpenCloseValveHistory(poHistory);
}else{
//涓婁釜鍏抽榾鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
}
}else{
//杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
}
}else{
//杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
}
}
}else{
//if(po.opType == null)
//鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁涔熶笉瀛樺湪鍏抽榾鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛屼絾涓哄畨鍏ㄤ篃杩涜澶勭悊锛屼篃璁や负涓婁釜鍏抽榾鎶ユ湭涓婃姤
- this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
+ this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍锛屾病鏈夊搴旂殑寮�鍙戞暟鎹�
this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
}
@@ -289,6 +289,7 @@
*/
private void updateCloseValve(SeClient clientVo,
PrController controller,
+ String rtuAddr,
RmOpenCloseValveLast poLast,
RmOpenCloseValveHistory poHistory,
DataV202404 dV202404,
@@ -298,73 +299,16 @@
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(dV202404, dataCd85Vo, 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(dV202404, dataCd85Vo, false);
}
}
-
-// /**
-// * 澶勭悊鍏抽榾鎶ユ暟鎹�
-// * @param sv 鏈嶅姟
-// * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
-// * @param controller 鎺у埗鍣ㄥ璞�
-// * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
-// * @param dataV202404 鍗忚鏁版嵁
-// * @param cdData 鍔熻兘鏁版嵁
-// */
-// private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
-// this.saveOrUpdateLast(sv, controller, rtuAddr, dataV202404, cdData);
-// this.saveHistory(sv, controller, rtuAddr, dataV202404, cdData);
-// }
-//
-// /**
-// * 淇濆瓨鎴栨洿鏂版帶鍒跺櫒鍏抽榾鎶ユ渶鏂版暟鎹�
-// * @param sv 鏈嶅姟bean
-// * @param controller 鎺у埗鍣ㄥ璞�
-// * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
-// * @param dataV202404 鍗忚鏁版嵁
-// * @param cdData 鍔熻兘鏁版嵁
-// */
-// private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
-// RmOpenCloseValveLast po = sv.getRmOpenCloseValveLast(controller.getIntakeId());
-// if(po == null){
-// po = new RmOpenCloseValveLast();
-// po.controllerId = controller==null?null:controller.getId();
-// po.intakeId = controller==null?null:controller.getIntakeId();
-// po.rtuAddr = rtuAddr;
-// po.valueFrom85(dataV202404, cdData);
-// sv.saveRmOpenCloseValveLast(po);
-// }else{
-// po.controllerId = controller==null?null:controller.getId();
-// po.intakeId = controller==null?null:controller.getIntakeId();
-// po.valueFrom85(dataV202404, cdData);
-// sv.updateRmOpenCloseValveLast(po);
-// }
-// }
-//
-// /**
-// * 淇濆瓨鎺у埗鍣ㄥ叧闃�鎶ュ巻鍙叉暟鎹�
-// * @param sv 鏈嶅姟bean
-// * @param controller 鎺у埗鍣ㄥ璞�
-// * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
-// * @param dataV202404 鍗忚鏁版嵁
-// * @param cdData 鍔熻兘鏁版嵁
-// */
-// private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
-// RmOpenCloseValveHistory po = new RmOpenCloseValveHistory();
-// po.controllerId = controller==null?null:controller.getId();
-// po.intakeId = controller==null?null:controller.getIntakeId();
-// po.rtuAddr = rtuAddr;
-// po.valueFrom85(dataV202404, cdData);
-// sv.saveRmOpenCloseValveHistory(po); ;
-// }
}
--
Gitblit v1.8.0