+ * 如：12345678 -> 78563412 + * 00 5f 8d c2 + * c28d5f00 + * + * @param str + * @return float + */ + public static float hexStrTofloat(String str) { + try { + String s = str.substring(6, 8) + str.substring(4, 6) + str.substring(2, 4) + str.substring(0, 2); + return Float.intBitsToFloat(new BigInteger(s, 16).intValue()); + } catch (NumberFormatException e) { + e.printStackTrace(); + System.err.println("errrrr.."); + return 0L; + } + } + + public static float hexStrTofloat1(String str) { + try { + int i = Integer.parseInt(str, 16); + byte byte4 = (byte) (i & 0xff); + byte byte3 = (byte) ((i & 0xff00) >> 8); + byte byte2 = (byte) ((i & 0xff0000) >> 16); + byte byte1 = (byte) ((i & 0xff000000) >> 24); // 拼装成 "高字节在后，低字节在前"的格式 + int realint = (byte1 & 0xff) << 0 | (byte2 & 0xff) << 8 | (byte3 & 0xff) << 16 | (byte4 & 0xff) << 24; + return Float.intBitsToFloat(realint); + } catch (NumberFormatException e) { + System.err.println("errrrr.."); + return 0L; + } + + } + + public static int bytesToInt(byte[] src, int startPos) { + if ((src == null) || (src.length <= 0) || (src.length < startPos + 4) || (startPos < 0)) { + return -1; + } + int result = (int) ((src[(startPos + 3)] & 0xFF) * 16777216 + (src[(startPos + 2)] & 0xFF) * 65536L + + (src[(startPos + 1)] & 0xFF) * 256L + (src[startPos] & 0xFF)); + return result; + } + + public static int bytesToIntHL(byte[] src, int startPos, int len) { + if ((src == null) || (src.length <= 0) || (src.length < startPos + len) || (startPos < 0)) { + return -1; + } + int result = 0; + for (int i = 0; i < len; i++) { + result += (int) ((src[(startPos + i)] & 0xFF) * (1 << (len - 1 - i) * 8)); + } + return result; + } + + public static void printHexString(byte[] b) { + for (int i = 0; i < b.length; i++) { + String hex = Integer.toHexString(b[i] & 0xFF); + if (hex.length() == 1) { + hex = '0' + hex; + } + System.out.print(hex.toUpperCase() + " "); + } + System.out.println(); + } + + /** + * 字节数组转为十六进制字符串 + * + * @param src + * @return + */ + public static String bytesToHexString(byte[] src) { + StringBuilder stringBuilder = new StringBuilder(""); + if ((src == null) || (src.length <= 0)) { + return null; + } + for (int i = 0; i < src.length; i++) { + int v = src[i] & 0xFF; + String hv = Integer.toHexString(v); + if (hv.length() < 2) { + stringBuilder.append(0); + } + stringBuilder.append(hv); + } + return stringBuilder.toString(); + } + + public static String bytesToDecString(byte[] src) { + if ((src == null) || (src.length <= 0)) { + return null; + } + int result = (int) ((src[3] & 0xFF) * 16777216 + (src[2] & 0xFF) * 65536L + (src[1] & 0xFF) * 256L + + (src[0] & 0xFF)); + return Integer.toString(result); + } + + public static String bytesToHexString(byte[] src, int len) { + StringBuilder stringBuilder = new StringBuilder(""); + StringBuilder temp = new StringBuilder(""); + if ((src == null) || (src.length <= 0)) { + return null; + } + for (int i = 0; i < src.length; i++) { + int v = src[i] & 0xFF; + if (v != 0) { + String hv = Integer.toHexString(v); + StringBuilder temp1 = new StringBuilder(""); + if (hv.length() < 2) { + temp1.append(0); + } + temp1.append(hv); + temp1.append(temp); + temp = temp1; + } + } + if (len / 2 > temp.length()) { + String result = temp.toString(); + for (int k = 0; k < (len - result.length()) / 2; k++) { + stringBuilder.append("00"); + } + stringBuilder.append(result); + } else { + stringBuilder = temp; + } + return stringBuilder.toString(); + } + + public static String bytesToDecString(byte[] src, int len) { + if ((src == null) || (src.length <= 0)) { + return null; + } + int result = (int) (src[3] * 16777216 + src[2] * 65536L + src[1] * 256L + src[0]); + String temp = Integer.toString(result); + if (temp.length() < len) { + StringBuilder finalString = new StringBuilder(""); + for (int k = 0; k < len - temp.length(); k++) { + finalString.append(0); + } + finalString.append(result); + return finalString.toString(); + } + return temp; + } + + public static float byte2float(byte[] b, int index) { + int l = b[(index + 0)]; + l &= 0xFF; + l = (int) (l | b[(index + 1)] << 8); + l &= 0xFFFF; + l = (int) (l | b[(index + 2)] << 16); + l &= 0xFFFFFF; + l = (int) (l | b[(index + 3)] << 24); + return Float.intBitsToFloat(l); + } + + public static int ASCIIToInt(byte[] b, int len) { + int result = 0; + for (int i = 0; i < len; i++) { + char temp = (char) b[i]; + int i_temp; + switch (temp) { + case 'A': + i_temp = 10; + break; + case 'B': + i_temp = 11; + break; + case 'C': + i_temp = 12; + break; + case 'D': + i_temp = 13; + break; + case 'E': + i_temp = 14; + break; + case 'F': + i_temp = 15; + break; + default: + i_temp = Integer.valueOf(temp).intValue(); + } + result = i_temp + result * 16; + } + return result; + } + + public static String ASCIIToString(byte[] b, int len) { + String result = ""; + for (int i = 0; i < len; i++) { + result = result + (char) b[i]; + } + return result; + } + + + /** + * 将16进制字符串转换为byte[] + * + * @param str + * @return + */ + public static byte[] toBytes(String str) { + if (str == null || str.trim().equals("")) { + return new byte[0]; + } + + byte[] bytes = new byte[str.length() / 2]; + for (int i = 0; i < str.length() / 2; i++) { + String subStr = str.substring(i * 2, i * 2 + 2); + bytes[i] = (byte) Integer.parseInt(subStr, 16); + } + + return bytes; + } + + + /** + * 带符号的16进制字符串转float + */ + public static float SigneHexToFloat(String str) { + String s = str.substring(2, 4) + str.substring(0, 2); + float x = (float) Integer.valueOf(s, 16).shortValue(); + return x; + } + + /** + * 有符号16进制转10进制 + * + * @param strHex + * @return + */ + public static int signedHexToDec(String strHex) { + if (strHex.length() == 0) { + return 0; + } + int x = 0; + //带符号十六进制转换十进制 + String fristNum = strHex.substring(0, 1); + String hexStr2Byte = parseHexStr2Byte(fristNum); + String flag = hexStr2Byte.substring(0, 1); + if ("1".equals(flag)) { + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < strHex.length(); i++) { + String num = strHex.substring(i, i + 1); + int decNum = Integer.parseInt(num, 16); + int a = decNum ^ 15; + sb.append(intToHex(a)); + } + x = -Integer.parseInt(sb.toString(), 16) - 1; + } else { + x = Integer.parseInt(strHex, 16); + } + + return x; + + } + + //十进制转16进制 + private static String intToHex(int n) { + StringBuffer s = new StringBuffer(); + String a; + char[] b = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + while (n != 0) { + s = s.append(b[n % 16]); + n = n / 16; + } + a = s.reverse().toString(); + return a; + } + + /** + * 将16进制转换为二进制 + * + * @param hexStr + * @return + */ + public static String parseHexStr2Byte(String hexStr) { + if (hexStr.length() == 0) { + return null; + } + int sint = Integer.valueOf(hexStr, 16); + //十进制在转换成二进制的字符串形式输出! + String bin = Integer.toBinaryString(sint); + for (int i = bin.length(); i < 4; i++) { + bin = "0" + bin; + } + return bin; + } +} + diff --git a/src/main/java/com/xydl/cac/util/DateUtil.java b/src/main/java/com/xydl/cac/util/DateUtil.java index d033d15..9825e48 100644 --- a/src/main/java/com/xydl/cac/util/DateUtil.java +++ b/src/main/java/com/xydl/cac/util/DateUtil.java @@ -1,5 +1,7 @@ package com.xydl.cac.util; +import lombok.extern.slf4j.Slf4j; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; @@ -8,6 +10,7 @@ import java.time.temporal.ChronoUnit; import java.util.Calendar; import java.util.Date; +@Slf4j public class DateUtil { public final static String defaultDatePattern = "yyyy-MM-dd HH:mm:ss"; public static DateTimeFormatter defaultFormatter = DateTimeFormatter.ofPattern(defaultDatePattern); @@ -109,6 +112,9 @@ public class DateUtil { Date date = parse(time); time = format(date); LocalDateTime localtime = LocalDateTime.parse(time, defaultFormatter); + if (localtime.getYear() < 2000) { + return null; + } ZonedDateTime zonedDateTime = localtime.atZone(ZoneOffset.UTC); ZonedDateTime convertedDateTime = zonedDateTime.withZoneSameInstant(ZoneId.systemDefault()); String result = convertedDateTime.format(defaultFormatter); diff --git a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java index c59961a..5da9067 100644 --- a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java +++ b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java @@ -98,6 +98,13 @@ public class IcdXmlUtil { String lnInst = fcdaNode.get("lnInst").asText(); String doName = fcdaNode.get("doName").asText(); String fc = fcdaNode.get("fc").asText(); + JsonNode preNode = fcdaNode.get("prefix"); + if (preNode != null) { + String prefix = preNode.asText(); + if (StringUtils.isNotBlank(prefix)) { + lnClass = prefix + lnClass; + } + } JsonNode lnNode = mapLN.get(lnClass + lnInst); String lnType = lnNode.get("lnType").asText(); @@ -154,6 +161,13 @@ public class IcdXmlUtil { for (JsonNode node : list) { String lnClass = node.get("lnClass").asText(); String inst = node.get("inst").asText(); + JsonNode preNode = node.get("prefix"); + if (preNode != null) { + String prefix = preNode.asText(); + if (StringUtils.isNotBlank(prefix)) { + lnClass = prefix + lnClass; + } + } map.put(lnClass + inst, node); } return map; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ef5c1d6..e3ccde9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -40,7 +40,7 @@ spring: cac: datapath: /home/xydl/ncac/data 61850: - enable: true + enable: false i2: enable: false url: http://192.168.1.190:8080/busi-back-ws/service/XydlService @@ -49,3 +49,7 @@ cac: token: e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328 secret: SEC72e5fb1b4ce7f9fed55386040d599035c50f8d2a181ad66bd1277549f0716124 rsakey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= + warnport: + name: ttyCH341USB0 + intervaltime: 60 + warntime: 5 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 33cd6df..b9815c4 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -49,3 +49,7 @@ cac: token: e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328 secret: SEC72e5fb1b4ce7f9fed55386040d599035c50f8d2a181ad66bd1277549f0716124 rsakey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= + warnport: + name: ttyCH341USB0 + intervaltime: 60 + warntime: 5 \ No newline at end of file