From ea84f710b449f931562ce649ff44cab05c15d9e0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 10 七月 2024 18:07:15 +0800
Subject: [PATCH] 1、实现用水户日用水量水费统计; 2、靳总IC卡结构中卡号(用户号)由10位改为17位,相应协议也变化。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
index 7b0e72a..a47ac4c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
@@ -33,6 +33,26 @@
         bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
     }
 
+
+    /**
+     * 鐢熸垚IC鍗$紪鐮�
+     * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
+     * @param icCardNo
+     * @param bs
+     * @param index
+     * @throws Exception
+     */
+    public static void createIcCardNo(String icCardNo, byte[] bs, int index) throws Exception {
+        String icCardNo1 = icCardNo.substring(0, 12) ;
+        String icCardNo2 = icCardNo.substring(12) ;
+
+        Integer icCardNo2Int = Integer.parseInt(icCardNo2) ;
+        ByteUtilUnsigned.short2Bytes_LE(bs, icCardNo2Int.shortValue(), index);
+
+        index += 2 ;
+        ByteUtil.string2BCD_LE(bs, icCardNo1, index) ;
+    }
+
     public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
         int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1_0_0.ctrlIndex, bsNoTail.length -1) ;
         byte[] bytes = new byte[ProtocolConstantV206V1_0_0.lenTail] ;

--
Gitblit v1.8.0