From 75432e263f73a89baed5dc4c4cccbe2ca7d6d446 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 03 三月 2025 10:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java | 60 ++----------------------------------------------------------
1 files changed, 2 insertions(+), 58 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
index cc838f5..65a8082 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
@@ -240,8 +240,8 @@
poLast.updateFrom(dataV202404, dataCd84Vo, clearLastCloseValve);
if(poHistory != null){
- poLast.clientId = clientVo==null?null:clientVo.getId() ;
- poLast.clientName = clientVo==null?null:clientVo.getName() ;
+ 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.updateFrom(dataV202404, dataCd84Vo, false);
@@ -249,60 +249,4 @@
}
-//
-// /**
-// * 澶勭悊寮�闃�鎶ユ暟鎹�
-// * @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, DataCd84Vo 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, DataCd84Vo 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.valueFrom84(dataV202404, cdData);
-// sv.saveRmOpenCloseValveLast(po);
-// }else{
-// po.controllerId = controller==null?null:controller.getId();
-// po.intakeId = controller==null?null:controller.getIntakeId();
-// po.valueFrom84(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, DataCd84Vo 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.valueFrom84(dataV202404, cdData);
-// sv.saveRmOpenCloseValveHistory(po); ;
-// }
}
--
Gitblit v1.8.0