From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java index 2f0c7d6..5f05861 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java @@ -4,7 +4,50 @@ public class ByteUtil { - + + /** + * 灏嗗瓧鑺傛暟缁勫垎鍓� + * @param bytes 琚垎鍓叉暟缁� + * @param fromIndex 鍒嗗壊璧峰浣嶇疆 + * @param len 鍒嗗壊闀垮害 + * @return 杩斿洖 鍒嗗壊鍑烘潵鐨勬暟缁� + */ + public static byte[] bytesSplit(byte[] bytes, int fromIndex, int len){ + if(bytes == null){ + return null ; + }else{ + byte[] bs = new byte[len] ; + if(fromIndex + len > bytes.length){ + System.arraycopy(bytes, fromIndex, bs, 0, bytes.length - fromIndex) ; + }else{ + System.arraycopy(bytes, fromIndex, bs, 0, len) ; + } + return bs ; + } + } + /** + * 灏嗗瓧鑺傛暟缁勫垎鍓� + * @param bytes 琚垎鍓叉暟缁� + * @param fromIndex 鍒嗗壊璧峰浣嶇疆 + * @param len 鍒嗗壊闀垮害 + * @return 杩斿洖 鍒嗗壊鍑烘潵鐨勬暟缁� + */ + public static Object[] bytesSplit_(byte[] bytes, int fromIndex, int len){ + if(bytes == null){ + return null ; + }else{ + int realLen = len ; + byte[] bs = new byte[len] ; + if(fromIndex + len > bytes.length){ + System.arraycopy(bytes, fromIndex, bs, 0, bytes.length - fromIndex) ; + realLen = bytes.length - fromIndex ; + }else{ + System.arraycopy(bytes, fromIndex, bs, 0, len) ; + } + return new Object[]{bs, realLen} ; + } + } + /** * 灏嗗瓧鑺傛暟缁勫悎骞跺埌瀛楄妭鏁扮粍涓� * @param bGroup1 琚悎骞舵暟缁� @@ -660,8 +703,7 @@ // s1涓嶅彉 s0 <<= 8; s = s0 | s1; - return (short) s; - + return (short)s ; } else { throw new Exception("byte2Short鏃舵暟缁勮秺鐣�"); } -- Gitblit v1.8.0