From b8e8696b61f4a896b16269157e7b85aa7b590009 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 17:13:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
index c6fb3ef..b20bd41 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
@@ -41,7 +41,7 @@
DbSv sv = (DbSv)objs[0] ;
PrController controller = (PrController)objs[1] ;
try{
- this.dealSave(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd83OpenVo) ;
+ this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd83OpenVo) ;
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�涓婃姤鏃跺彂鐢熷紓甯�", e);
}
@@ -49,14 +49,14 @@
}
}
/**
- * 淇濆瓨鏁版嵁
+ * 涓氬姟澶勭悊
* @param sv 鏈嶅姟
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dV1_0_1 涓婃姤鏁版嵁
* @param dataCd83OpenVo 寮�闃�涓婃姤鏁版嵁瀵硅薄
*/
- private void dealSave(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
+ private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(rtuAddr) ;
if(poLast == null){
//棣栧厛鐢熸垚鍘嗗彶鏁版嵁锛屽苟淇濆瓨
@@ -75,7 +75,7 @@
//閲嶅涓婃姤鐨勫紑闃�鏁版嵁锛屼笉杩涜澶勭悊
}else{
//褰撳墠寮�闃�涓婃姤鏄柊鐨勪竴娆″紑闃�锛屼笉绠″師璁板綍鏄惁瀛樺湪鍏抽榾鏁版嵁锛屼竴寰嬫竻绌哄叧闃�鏁版嵁
- this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
+ this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫紑闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
}
@@ -87,13 +87,13 @@
if(poLast.lastHistoryId != null){
poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
}
- this.updateOpenValve(poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
+ this.updateOpenValve(controller, poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
if(poHistory != null){
sv.updateRmOpenCloseValveHistory(poHistory);
}
}else if(poLast.closeDt != null && poLast.closeDt.before(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt))){
//褰撳墠涓婃姤鏄柊鐨勫紑闃�鏁版嵁
- this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
+ this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫紑闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
}else {
@@ -102,7 +102,7 @@
if(poLast.lastHistoryId != null){
poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
}
- this.updateOpenValve(poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
+ this.updateOpenValve(controller, poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
if(poHistory != null){
sv.updateRmOpenCloseValveHistory(poHistory);
}
@@ -110,7 +110,7 @@
}else{
//if(po.clType == null)
//鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁涔熶笉瀛樺湪鍏抽榾鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛屼絾涓哄畨鍏ㄤ篃杩涜澶勭悊
- this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
+ this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
//鐢熸垚骞朵繚瀛樻柊鐨勫紑闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
}
@@ -188,6 +188,7 @@
/**
* 鏇存柊鏁版嵁
+ * @param controller
* @param poLast
* @param poHistory
* @param dV1_0_1
@@ -195,7 +196,10 @@
* @param clearCloseValve
* @throws Exception
*/
- private void updateOpenValve(RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
+ private void updateOpenValve(PrController controller, RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
+ poLast.controllerId = controller==null?null:controller.getId();
+ poLast.intakeId = controller==null?null:controller.getIntakeId();
+
poLast.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
poLast.opType = dataCd83OpenVo.type ;
poLast.opTotalAmount = dataCd83OpenVo.totalAmount ;
@@ -205,6 +209,9 @@
poLast.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
if(poHistory != null){
+ poHistory.controllerId = controller==null?null:controller.getId();
+ poHistory.intakeId = controller==null?null:controller.getIntakeId();
+
poHistory.opDt = poLast.opDt;
poHistory.opType = dataCd83OpenVo.type ;
poHistory.opTotalAmount = dataCd83OpenVo.totalAmount ;
--
Gitblit v1.8.0