From 99bf09fbc855590e209dda4cd2b6c725101cbe9c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 26 七月 2024 14:39:43 +0800 Subject: [PATCH] 1、完善代码,把开关阀类型编码改为BCD码; 2、制定并实现协议“定时关阀计划开阀(A1H)”和“定量关阀计划开阀(A2H)”. --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Down.java | 9 ++++++++- 1 files changed, 8 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..672ae4f 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 @@ -95,7 +95,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