فهرست منبع

ifsc rtln update

shjung 3 سال پیش
والد
کامیت
61e280b0d1
2فایلهای تغییر یافته به همراه30 افزوده شده و 10 حذف شده
  1. 1 1
      src/main/java/com/its/op/entity/its/ifsc/TbIfscLinkRltn.java
  2. 29 9
      src/main/java/com/its/utils/SysUtils.java

+ 1 - 1
src/main/java/com/its/op/entity/its/ifsc/TbIfscLinkRltn.java

@@ -67,7 +67,7 @@ public class TbIfscLinkRltn implements Serializable {
                     .linkLeng(this.link.getLinkLeng())
                     .sectGradCd(this.link.getSectGradCd())
                     .fromNodeInfo(this.link.getFromNode() != null ? this.link.getFromNode().getNodeName() : "")
-                    .toNodeInfo(this.link.getToNode() != null ? this.link.getFromNode().getNodeName() : "")
+                    .toNodeInfo(this.link.getToNode() != null ? this.link.getToNode().getNodeName() : "")
                     .build();
 
             dto.setRoadRankDesc(CodeManager.getCodeDesc(CodeManager.ROAD_RANK, dto.getRoadRank()));

+ 29 - 9
src/main/java/com/its/utils/SysUtils.java

@@ -223,22 +223,42 @@ public final class SysUtils
 
 		if (byteOrder == ByteOrder.BIG_ENDIAN) {
 			return (
-				((bytes[fromIdx+0] & 0xFF) << 24) |
-				((bytes[fromIdx+1] & 0xFF) << 16) |
-				((bytes[fromIdx+2] & 0xFF) << 8 ) |
-				((bytes[fromIdx+3] & 0xFF) << 0 )
+					((bytes[fromIdx+0] & 0xFF) << 24) |
+					((bytes[fromIdx+1] & 0xFF) << 16) |
+					((bytes[fromIdx+2] & 0xFF) << 8 ) |
+					((bytes[fromIdx+3] & 0xFF) << 0 )
 			);
 		}
 		return (
-			((bytes[fromIdx+3] & 0xFF) << 24) |
-			((bytes[fromIdx+2] & 0xFF) << 16) |
-			((bytes[fromIdx+1] & 0xFF) << 8 ) |
-			((bytes[fromIdx+0] & 0xFF) << 0 )
+				((bytes[fromIdx+3] & 0xFF) << 24) |
+				((bytes[fromIdx+2] & 0xFF) << 16) |
+				((bytes[fromIdx+1] & 0xFF) << 8 ) |
+				((bytes[fromIdx+0] & 0xFF) << 0 )
 		);
 	}
-
 	public static byte[] intToBytes(int value) {
 		// BIG_ENDIAN
 		return  ByteBuffer.allocate(4).putInt(value).array();
 	}
+
+	public static int bytesToShort(byte[] bytes) {
+		return ByteBuffer.wrap(bytes).getShort();
+	}
+	public static int bytesToShort(byte[] bytes, int fromIdx, ByteOrder byteOrder) {
+
+		if (byteOrder == ByteOrder.BIG_ENDIAN) {
+			return (
+					((bytes[fromIdx+0] & 0xFF) << 8) |
+					((bytes[fromIdx+1] & 0xFF) << 0 )
+			);
+		}
+		return (
+				((bytes[fromIdx+1] & 0xFF) << 8 ) |
+				((bytes[fromIdx+0] & 0xFF) << 0 )
+		);
+	}
+	public static byte[] shortToBytes(short value) {
+		// BIG_ENDIAN
+		return  ByteBuffer.allocate(2).putShort(value).array();
+	}
 }