From 06c1e69816f028c3108ce4e1e01db4251e481b06 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:41:21 +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/p206V1_0_0/TkDealCloseValveReport.java | 81 ++++++----------------------------------
1 files changed, 12 insertions(+), 69 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 76b86b6..6638d2e 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
@@ -141,20 +141,11 @@
* @throws Exception
*/
private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
- RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- null, null, null, null, null, null,null,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83CloseVo.type,
- dataCd83CloseVo.totalAmount,
- dataCd83CloseVo.icCardNo,
- dataCd83CloseVo.icCardAddr,
- dataCd83CloseVo.remainMoney,
- dataCd83CloseVo.thisAmount,
- dataCd83CloseVo.thisMoney,
- dataCd83CloseVo.thisTime,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
+ RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+ po.rtuAddr = rtuAddr ;
+ po.valueFrom(dV1_0_1, dataCd83CloseVo);
return po ;
}
@@ -169,20 +160,11 @@
* @throws Exception
*/
private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
- RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- null, null, null, null, null, null,null,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83CloseVo.type,
- dataCd83CloseVo.totalAmount,
- dataCd83CloseVo.icCardNo,
- dataCd83CloseVo.icCardAddr,
- dataCd83CloseVo.remainMoney,
- dataCd83CloseVo.thisAmount,
- dataCd83CloseVo.thisMoney,
- dataCd83CloseVo.thisTime,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
+ RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+ po.rtuAddr = rtuAddr ;
+ po.valueFrom(dV1_0_1, dataCd83CloseVo);
return po ;
}
@@ -201,53 +183,14 @@
poLast.controllerId = controller==null?null:controller.getId();
poLast.intakeId = controller==null?null:controller.getIntakeId();
- poLast.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
- poLast.clType = dataCd83CloseVo.type;
- poLast.clTotalAmount = dataCd83CloseVo.totalAmount;
- poLast.clIcCardNo = dataCd83CloseVo.icCardNo;
- poLast.clIcCardAddr = dataCd83CloseVo.icCardAddr;
- poLast.clRemainMoney = dataCd83CloseVo.remainMoney;
- poLast.clThisAmount = dataCd83CloseVo.thisAmount;
- poLast.clThisMoney = dataCd83CloseVo.thisMoney;
- poLast.clThisTime = dataCd83CloseVo.thisTime;
- poLast.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
- poLast.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
+ poLast.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);
if(poHistory != null){
poHistory.controllerId = controller==null?null:controller.getId();
poHistory.intakeId = controller==null?null:controller.getIntakeId();
- poHistory.clDt = poLast.clDt;
- poHistory.clType = dataCd83CloseVo.type;
- poHistory.clTotalAmount = dataCd83CloseVo.totalAmount;
- poHistory.clIcCardNo = dataCd83CloseVo.icCardNo;
- poHistory.clIcCardAddr = dataCd83CloseVo.icCardAddr;
- poHistory.clRemainMoney = dataCd83CloseVo.remainMoney;
- poHistory.clThisAmount = dataCd83CloseVo.thisAmount;
- poHistory.clThisMoney = dataCd83CloseVo.thisMoney;
- poHistory.clThisTime = dataCd83CloseVo.thisTime;
- poHistory.clOpenDt = poLast.clOpenDt;
- poHistory.closeDt = poLast.closeDt ;
+ poHistory.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);
}
- if(clearOpenValve){
- poLast.opDt = null ;
- poLast.opType = null ;
- poLast.opTotalAmount = null ;
- poLast.opIcCardNo = null ;
- poLast.opIcCardAddr = null ;
- poLast.opRemainMoney = null ;
- poLast.openDt = null ;
-
- if(poHistory != null) {
- poHistory.opDt = null ;
- poHistory.opType = null ;
- poHistory.opTotalAmount = null ;
- poHistory.opIcCardNo = null ;
- poHistory.opIcCardAddr = null ;
- poHistory.opRemainMoney = null ;
- poHistory.openDt = null ;
- }
- }
}
}
--
Gitblit v1.8.0