From 6be968854d7a134cf31b8af7b8ffb219da5cee55 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:36:40 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
index 3735170..b65aba9 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
@@ -63,32 +63,46 @@
//鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鎺у埗鍣ㄧ殑寮�鍏抽榾鏁版嵁
//棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
poLast = this.newRmOpenCloseValveLast(controller, rtuAddr, dV1_0_1, dataCd83CloseVo);
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
//淇濆瓨鏈�鏂版暟鎹�
sv.saveRmOpenCloseValveLast(poLast);
}else{
if(poLast.clType == null){
//鍘熻褰曚笉瀛樺湪鍏抽榾鏁版嵁锛屾墍浠ュ綋鍓嶅叧闃�涓婃姤鏄柊鐨勪竴娆″叧闃�
- if(poLast.opType == null){
- //鍘熻褰曚腑涓嶅瓨鍦ㄥ紑闃�鏁版嵁锛屾病鍔炴硶杩涜鍖归厤
+ if(poLast.opType == null || poLast.openDt == null){
+ //鍘熻褰曚腑涓嶅瓨鍦ㄥ紑闃�鏁版嵁(鍗冲紑闃�涓庡叧闃�鏁版嵁閮芥病鏈夛紝杩欑鎯呭喌涓�鑸笉瀛樺湪)锛屾病鍔炴硶杩涜鍖归厤
//鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
}else{
//鍘熻褰曚腑瀛樺湪寮�闃�鏁版嵁锛岃繘琛屽巻鍙叉暟鎹尮閰�
RmOpenCloseValveHistory poHistory = null ;
if(poLast.lastHistoryId != null){
poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
if(poHistory != null){
- //褰撳墠鍏抽榾涓婃姤鏄柊鐨勪竴娆″叧闃�锛屼繚鐣欏師璁板綍涓殑寮�闃�鏁版嵁
- this.updateCloseValve(controller, poLast, poHistory, dV1_0_1, dataCd83CloseVo, false) ;
- sv.updateRmOpenCloseValveHistory(poHistory);
+ if(poHistory.openDt != null){
+ //涓婇潰宸茬粡鍒ゆ柇浜唒oLast.openDt == null锛屾墍浠ユ澶勪竴鑸細鏄痯oHistory.openDt != null
+ if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
+ //鍖归厤鎴愬姛
+ //褰撳墠鍏抽榾鏄師璁板綍涓紑闃�鐨勫搴斿叧闃�
+ this.updateCloseValve(controller, poLast, poHistory, dV1_0_1, dataCd83CloseVo, false) ;
+ sv.updateRmOpenCloseValveHistory(poHistory);
+ }else{
+ //鍖归厤澶辫触
+ //褰撳墠鍏抽榾涓嶆槸鍘熻褰曚腑寮�闃�鐨勫搴斿叧闃�锛岀敓鎴愬苟淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
+ }
+ }else{
+ //杩欑鎯呭喌涓嶅瓨鍦紝璁や负鍖归厤澶辫触
+ //褰撳墠鍏抽榾涓嶆槸鍘熻褰曚腑寮�闃�鐨勫搴斿叧闃�锛岀敓鎴愬苟淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
+ }
}else{
//娌℃湁鍘嗗彶鏁版嵁锛岀敓鎴愬苟淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
}
}else{
//娌℃湁鍘嗗彶鏁版嵁锛岀敓鎴愬苟淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
}
}
}else if(poLast.opType != null){
@@ -99,15 +113,15 @@
//閲嶅涓婃姤浜嗭紝涓嶈繘琛屽鐞�
}else {
//褰撳墠涓婃姤鐨勫叧闃�鏁版嵁鏅氫簬鍘熸潵鐨勫叧闃�鏁版嵁锛屾槸鏂扮殑涓婃姤鍏抽榾鏁版嵁
- this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, true) ;
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
}
}else{
//if(po.opType == null)
//鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁涔熶笉瀛樺湪鍏抽榾鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛屼絾涓哄畨鍏ㄤ篃杩涜澶勭悊
this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
- this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
+ this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
}
sv.updateRmOpenCloseValveLast(poLast);
@@ -124,11 +138,20 @@
* @param poLast
* @throws Exception
*/
- private void newHistoryDataDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, RmOpenCloseValveLast poLast)throws Exception {
+ private void newHistoryDataDeal(DbSv sv,
+ PrController controller,
+ String rtuAddr,
+ DataV1_0_1 dV1_0_1,
+ DataCd83CloseVo dataCd83CloseVo,
+ RmOpenCloseValveLast poLast,
+ Boolean clearOpenValue)throws Exception {
RmOpenCloseValveHistory poHistory = this.newRmOpenCloseValveHistory(controller, rtuAddr, dV1_0_1, dataCd83CloseVo) ;
sv.saveRmOpenCloseValveHistory(poHistory);
//鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
poLast.lastHistoryId = poHistory == null ? null: poHistory.id ;
+ if(clearOpenValue != null && clearOpenValue.booleanValue()){
+ poLast.clearOpenValue();
+ }
}
/**
@@ -140,7 +163,10 @@
* @return
* @throws Exception
*/
- private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
+ private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller,
+ String rtuAddr,
+ DataV1_0_1 dV1_0_1,
+ DataCd83CloseVo dataCd83CloseVo)throws Exception {
RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
po.controllerId = controller==null?null:controller.getId() ;
po.intakeId = controller==null?null:controller.getIntakeId() ;
@@ -159,7 +185,10 @@
* @return
* @throws Exception
*/
- private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
+ private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller,
+ String rtuAddr,
+ DataV1_0_1 dV1_0_1,
+ DataCd83CloseVo dataCd83CloseVo)throws Exception {
RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
po.controllerId = controller==null?null:controller.getId() ;
po.intakeId = controller==null?null:controller.getIntakeId() ;
@@ -179,7 +208,12 @@
* @param clearOpenValve
* @throws Exception
*/
- private void updateCloseValve(PrController controller, RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {
+ private void updateCloseValve(PrController controller,
+ RmOpenCloseValveLast poLast,
+ RmOpenCloseValveHistory poHistory,
+ DataV1_0_1 dV1_0_1,
+ DataCd83CloseVo dataCd83CloseVo,
+ boolean clearOpenValve) throws Exception {
poLast.controllerId = controller==null?null:controller.getId();
poLast.intakeId = controller==null?null:controller.getIntakeId();
--
Gitblit v1.8.0