From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index d2ac976..17e4e73 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -114,18 +114,16 @@
         ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
         ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
         ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
-        //浠ヤ笅鍐欐硶鑷劧涔熸槸BCD
-        bs[index + 4] = (byte)((DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM()))) ;
-        ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
 
-        /*
-        bs[index] = Byte.parseByte(DateTime.ss()) ;
-        bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
-        bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
-        bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
-        bs[index + 4] = (byte)(DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM())) ;
-        bs[index + 5] = Byte.parseByte(DateTime.yy()) ;
-        */
+        byte week = DateTime.week_Int().byteValue() ;
+        byte month = Byte.parseByte(DateTime.MM()) ;
+        if(month < 10){
+            bs[index + 4] = (byte)((week << 5) | month) ;
+        }else{
+            bs[index + 4] = (byte)((week << 5) | 0x10 | (month - 10)) ;
+        }
+
+        ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
     }
 
     public static void createS2D(byte[] bs, int index) throws Exception {
@@ -133,12 +131,6 @@
         ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
         ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
         ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
-        /*
-        bs[index] = Byte.parseByte(DateTime.ss()) ;
-        bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
-        bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
-        bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
-        */
     }
 
     public static void createLen(byte[] bsNoTail) throws Exception {

--
Gitblit v1.8.0