From f03453071fc641c9e459b4b0d767cb2acac4c13a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 14:01:27 +0800
Subject: [PATCH] 根据表阀一体机协议上行数据，实现漏损日统计、取水口用水日统计、IC卡剩余金额同步设置、农户用水日统计
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
index bd18237..e3e8e91 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
@@ -76,7 +76,7 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
confirmCommand.isQuickSend = true ;
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
return new MidResult[]{confirmCommand, midRs} ;
}
@@ -89,9 +89,9 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- DataV202404 dV1 = (DataV202404)data.getSubData() ;
+ DataV202404 dV202404 = (DataV202404)data.getSubData() ;
DataCd83Vo cdData = new DataCd83Vo(CodeV202404.getCodeName(dataCode)) ;
- dV1.subData = cdData ;
+ dV202404.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -133,9 +133,11 @@
String ymd = "20" + yy + "-" + mm + "-" + dd ;
- cdData.rtuDt = ymd + " " + hh ;
+ cdData.rtuDt = ymd + " " + hh + ":00:00" ;
cdData.dataDt = DateTime.lastXDay_yyyy_MM_dd(ymd, 1) ;
+
+ cdData.dataDt += " 23:59:59" ;
}
}
--
Gitblit v1.8.0