From 710c6a4d568237016a70b74aa3769b89e336725c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 15:48:21 +0800
Subject: [PATCH] 1、实现功能码92、93命令web后端接口定义与逻辑代码实现； 2、修改原来功能逻辑实现的逻辑，增加回调； 3、表阀一体机协议命令结果数据库存储补充实现。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 9c560a6..273c54a 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
@@ -21,6 +21,9 @@
* @LastEditTime 2024-06-20 13:48
* @Description
*/
+/**
+ * 澶勭悊鎺у埗鍣ㄥ叧闃�涓婃姤
+ */
public class TkDealCloseValveReportV202404 extends TaskSurpport {
private static final Logger log = LogManager.getLogger(TkDealCloseValveReportV202404.class.getName());
@@ -29,7 +32,6 @@
/**
* 鎵ц鑺傜偣浠诲姟锛氬叧闃�涓婃姤
- *
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
@@ -119,7 +121,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 +162,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 +291,7 @@
*/
private void updateCloseValve(SeClient clientVo,
PrController controller,
+ String rtuAddr,
RmOpenCloseValveLast poLast,
RmOpenCloseValveHistory poHistory,
DataV202404 dV202404,
@@ -298,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(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);
}
}
-
}
--
Gitblit v1.8.0