From 26d63d120e517624be6fcf70ae9620c3582a91dd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 17:35:06 +0800
Subject: [PATCH] 2024-06-18 朱宝民 优化开关阀逻辑
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
index 01aac6f..a1f920f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCd84Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
@@ -55,7 +55,7 @@
* @param dataCd84Vo 宸ヤ綔鎶ユ暟鎹璞�
*/
private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
- this.saveLast(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
+ this.saveOrUpdateLast(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
this.saveHistory(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
}
@@ -67,30 +67,30 @@
* @param dV1_0_1
* @param dataCd84Vo
*/
- private void saveLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
- RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
- if(po == null){
- po = new RmWorkReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
- dataCd84Vo.cardNo,
- dataCd84Vo.totalAmount,
- dataCd84Vo.instantAmount,
- dataCd84Vo.remainMoney) ;
- sv.saveRmWorkReportLast(po) ;
- }else{
- po.controllerId = controller==null?null:controller.getId();
- po.intakeId = controller==null?null:controller.getIntakeId();
-
- po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
- po.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt);
- po.icCardNo = dataCd84Vo.cardNo;
- po.totalAmount = dataCd84Vo.totalAmount;
- po.instantAmount = dataCd84Vo.instantAmount;
- po.remainMoney = dataCd84Vo.remainMoney;
- sv.updateRmWorkReportLast(po);
- }
+ private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
+// RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
+// if(po == null){
+// po = new RmWorkReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+// rtuAddr,
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
+// dataCd84Vo.cardNo,
+// dataCd84Vo.totalAmount,
+// dataCd84Vo.instantAmount,
+// dataCd84Vo.remainMoney) ;
+// sv.saveRmWorkReportLast(po) ;
+// }else{
+// po.controllerId = controller==null?null:controller.getId();
+// po.intakeId = controller==null?null:controller.getIntakeId();
+//
+// po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+// po.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt);
+// po.icCardNo = dataCd84Vo.cardNo;
+// po.totalAmount = dataCd84Vo.totalAmount;
+// po.instantAmount = dataCd84Vo.instantAmount;
+// po.remainMoney = dataCd84Vo.remainMoney;
+// sv.updateRmWorkReportLast(po);
+// }
}
/**
* 淇濆瓨闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹�
@@ -101,15 +101,15 @@
* @param dataCd84Vo
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
- RmWorkReportHistory po = new RmWorkReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
- dataCd84Vo.cardNo,
- dataCd84Vo.totalAmount,
- dataCd84Vo.instantAmount,
- dataCd84Vo.remainMoney) ;
- sv.saveRmWorkReportHistory(po) ;
+// RmWorkReportHistory po = new RmWorkReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+// rtuAddr,
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
+// dataCd84Vo.cardNo,
+// dataCd84Vo.totalAmount,
+// dataCd84Vo.instantAmount,
+// dataCd84Vo.remainMoney) ;
+// sv.saveRmWorkReportHistory(po) ;
}
--
Gitblit v1.8.0