From 2a28162376e873e23feb00cc71a420c885e27c62 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 21:24:30 +0800
Subject: [PATCH] 修改下划线bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java
index 3f18c40..6e37145 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java
@@ -34,6 +34,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 ;//鏄惁鏈夊簲绛�
@@ -95,7 +96,14 @@
byte[] bs = new byte[10];
Double remainMoneyAlarmDb = cvo.remainMoneyAlarm * 100.0;
Integer remainMoneyAlarmInt = remainMoneyAlarmDb.intValue();
- ByteUtilUnsigned.short2Bytes_LE(bs, remainMoneyAlarmInt.shortValue(), index);
+ byte[] bb = ByteUtil.int2BCD_LE(remainMoneyAlarmInt) ;
+ if(bb.length == 1){
+ bs[0] = bb[0] ;
+ }else if(bb.length == 2){
+ bs[0] = bb[0] ;
+ bs[1] = bb[1] ;
+ }
+ //ByteUtilUnsigned.short2Bytes_LE(bs, remainMoneyAlarmInt.shortValue(), index);
index += 2;
GlCreate.createPw(bs, index);
index += 2;
--
Gitblit v1.8.0