From 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期日, 27 四月 2025 20:40:19 +0800 Subject: [PATCH] fix(irrigatePlan): 修正灌溉计划开始时间逻辑 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 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 2e8f20f..49f7648 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 @@ -34,6 +34,21 @@ return bsHead ; } + + /** + * 0xf0闃�闂� 0x00姘存车 + * @param controllerTypeByHex + * @param bs + * @param index + */ + public static void createValveOrPump(String controllerTypeByHex, byte[] bs, int index){ + if(controllerTypeByHex != null && controllerTypeByHex.equals("57")){ + bs[index] = (byte)0x00 ; + }else{ + bs[index] = (byte)0xF0 ; + } + } + /** * 鐢熸垚鎺у埗鍣ㄥ湴鍧� * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX @@ -169,8 +184,8 @@ byte[] crcBs = new byte[4] ; ByteUtil.int2Bytes_BE(crcBs, crc, 0); byte[] bytes = new byte[ProtocolConstantV206V202404.UG_lenTail] ; - bytes[0] = crcBs[3] ; - bytes[1] = crcBs[4] ; + bytes[0] = crcBs[2] ; + bytes[1] = crcBs[3] ; bytes[2] = ProtocolConstantV206V202404.P_Tail_Byte ; return bytes ; } -- Gitblit v1.8.0