From 3878bfa207d6dd0a8a84177a437ec3b3a9a6825d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 14:30:41 +0800
Subject: [PATCH] remote模块远程开关阀逻辑修改
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
index e279612..73dd128 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
@@ -91,9 +91,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() ;
DataCd84Vo cdData = new DataCd84Vo(CodeV202404.getCodeName(dataCode)) ;
- dV1.subData = cdData ;
+ dV202404.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -104,6 +104,8 @@
index ++ ;//褰撳墠鐢ㄦ按鏂瑰紡
cdData.opType = bs[index];
+ //杩涜鍏煎杞崲
+ cdData.opType = CommonV202404.openType2P206V1(cdData.opType) ;
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -132,6 +134,19 @@
index += 5 ;
GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
- }
+ index += 4 ;
+ cdData.price = ByteUtil.BCD2Int_LE(bs, index, index + 1)/100.0 ;
+
+ }
+ public static void main(String[] args) throws Exception {
+ String hex = "69426981371425010201130084020AF00200000000620902003004050077289364503912943449101006255833070000000000000000000000000000000000014000009000C616";
+ byte[] bs = ByteUtil.hex2Bytes(hex) ;
+ Cd_84_Up p = new Cd_84_Up() ;
+ Data d = new Data() ;
+ DataV202404 subd = new DataV202404() ;
+ d.subData = subd ;
+ p.doParse(bs, bs.length, "84", d);
+ System.out.println(d.toString());
+ }
}
--
Gitblit v1.8.0