From a27fab527ce7d4aa8c9c8f0645cb8c2520590407 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 14:20:51 +0800
Subject: [PATCH] 1、靳总协议解析与构造修改完善; 2、靳总协议上行数据处理修改完善; 3、增加UserTokenFilter非过滤（放行）URL功能实现。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java | 79 ++++++---------------------------------
1 files changed, 13 insertions(+), 66 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
index dd8d58a..ec3519d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
@@ -67,6 +67,7 @@
//鏁版嵁搴撲腑瀛樺湪璇ユ帶鍒跺櫒鐨勫紑鍏抽榾鏁版嵁
if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt).equals(poLast.openDt)){
//鏃堕棿涓�鑷达紝閲嶅涓婃姤鏁版嵁锛屼笉杩涜浠讳綍澶勭悊
+ //log.error("娴嬭瘯寮�闃�鏃ユ湡涓�鑷�");
}else{
if(poLast.opType != null){
//鍘熻褰曞瓨鍦ㄥ紑闃�鏁版嵁锛岄鍏堣繘琛屾椂闂村姣�
@@ -149,16 +150,11 @@
* @throws Exception
*/
private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
- RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83OpenVo.type,
- dataCd83OpenVo.totalAmount,
- dataCd83OpenVo.icCardNo,
- dataCd83OpenVo.icCardAddr,
- dataCd83OpenVo.remainMoney,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt),
- null, null, null, null, null, null, null, null, null, null, null) ;
+ 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, dataCd83OpenVo);
return po ;
}
@@ -173,16 +169,11 @@
* @throws Exception
*/
private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
- RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83OpenVo.type,
- dataCd83OpenVo.totalAmount,
- dataCd83OpenVo.icCardNo,
- dataCd83OpenVo.icCardAddr,
- dataCd83OpenVo.remainMoney,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt),
- null, null, null, null, null, null, null, null, null, null, null) ;
+ 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, dataCd83OpenVo);
return po ;
}
@@ -200,56 +191,12 @@
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 ;
- poLast.opIcCardNo = dataCd83OpenVo.icCardNo ;
- poLast.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- poLast.opRemainMoney = dataCd83OpenVo.remainMoney ;
- poLast.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
+ poLast.updateFrom(dV1_0_1, dataCd83OpenVo, clearCloseValve);
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 ;
- poHistory.opIcCardNo = dataCd83OpenVo.icCardNo ;
- poHistory.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- poHistory.opRemainMoney = dataCd83OpenVo.remainMoney ;
- poHistory.openDt = poLast.openDt ;
+ poHistory.updateFrom(dV1_0_1, dataCd83OpenVo, clearCloseValve);
}
-
- if(clearCloseValve){
- poLast.clDt = null ;
- poLast.clType = null ;
- poLast.clTotalAmount = null ;
- poLast.clIcCardNo = null ;
- poLast.clIcCardAddr = null ;
- poLast.clRemainMoney = null ;
- poLast.clThisAmount = null ;
- poLast.clThisMoney = null ;
- poLast.clThisTime = null ;
- poLast.clOpenDt = null ;
- poLast.closeDt = null ;
-
- if(poHistory != null) {
- poHistory.clDt = null;
- poHistory.clType = null;
- poHistory.clTotalAmount = null;
- poHistory.clIcCardNo = null;
- poHistory.clIcCardAddr = null;
- poHistory.clRemainMoney = null;
- poHistory.clThisAmount = null;
- poHistory.clThisMoney = null;
- poHistory.clThisTime = null;
- poHistory.clOpenDt = null;
- poHistory.closeDt = null;
- }
-
- }
-
}
}
--
Gitblit v1.8.0