From 7f5b61a32aa6687eac4cebb4705ced19145dd692 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 13:41:53 +0800
Subject: [PATCH] 2024-07-03 朱宝民 获取充值记录接口添加返回值
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 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..40dde5d 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
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
@@ -141,21 +140,22 @@
* @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)) ;
- return po ;
+ //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)) ;
+ //return po ;
+ return null;
}
@@ -169,21 +169,22 @@
* @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)) ;
- return po ;
+ //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)) ;
+ //return po ;
+ return null;
}
--
Gitblit v1.8.0