From 2e624b0b3df6bf8e8d6e09992941d4a0e9116a96 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 08:41:01 +0800
Subject: [PATCH] 重新定义并优化RTU上行数据接口
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
index 33787cd..0aefe2b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
@@ -33,6 +33,7 @@
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV1_0_1.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -92,16 +93,17 @@
throw new Exception("姘翠环涓嶈兘涓虹┖") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
- byte[] bs = new byte[11] ;
+ byte[] bs = new byte[14] ;
index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
- index += 5 ;
+ index += 8 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
--
Gitblit v1.8.0