From fcc87a4bdb9cd45767ff65f4b182261371c93457 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 07 八月 2020 15:50:19 +0800
Subject: [PATCH] #新版HSL
---
/dev/null | 379 -----------------------------------------------
src/main/java/com/zy/core/channel/TestController.java | 1
src/main/java/com/zy/common/Main.java | 30 +-
src/main/java/com/zy/core/thread/CrnThread.java | 8
src/main/java/com/zy/core/thread/DevpThread.java | 10
5 files changed, 26 insertions(+), 402 deletions(-)
diff --git a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftBasic.java b/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftBasic.java
deleted file mode 100644
index 5279eff..0000000
--- a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftBasic.java
+++ /dev/null
@@ -1,383 +0,0 @@
-package com.zy.common.HslCommunication.BasicFramework;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-
-
-public class SoftBasic {
-
-
- /**
- * 鏍规嵁澶у皬鑾峰彇鏂囨湰鎻忚堪淇℃伅
- * @param size 鏁版嵁澶у皬
- * @return 瀛楃涓叉枃鏈�
- */
- public static String GetSizeDescription(long size) {
- if (size < 1000) {
- return size + " B";
- } else if (size < 1000 * 1000) {
- float data = (float) size / 1024;
- return String.format("%.2f", data) + " Kb";
- } else if (size < 1000 * 1000 * 1000) {
- float data = (float) size / 1024 / 1024;
- return String.format("%.2f", data) + " Mb";
- } else {
- float data = (float) size / 1024 / 1024 / 1024;
- return String.format("%.2f", data) + " Gb";
- }
- }
-
-
- /**
- * 鍒ゆ柇涓や釜瀛楄妭鏁扮粍鏄惁鏄竴鑷寸殑锛屽彲浠ユ寚瀹氫腑闂寸殑鏌愪釜鍖哄煙
- * @param b1 绗竴涓瓧鑺傛暟缁�
- * @param start1 璧峰瀛楄妭
- * @param b2 绗簩涓瓧鑺傛暟缁�
- * @param start2 璧峰瀛楄妭
- * @param length 瀵规瘮鏁版嵁鐨勯暱搴�
- * @return 鏄惁涓�鑷�
- */
- public static boolean IsTwoBytesEquel(byte[] b1, int start1, byte[] b2, int start2, int length)
- {
- if (b1 == null || b2 == null) return false;
- for (int i = 0; i < length; i++)
- {
- if (b1[i + start1] != b2[i + start2])
- {
- return false;
- }
- }
-
- return true;
- }
-
-
- /**
- * 灏哹yte鏁扮粍鐨勯暱搴︽墿鍏呭埌鎸囧畾闀垮害
- * @param data 鍘熷厛鐨勬暟鎹暱搴�
- * @param length 鎵╁厖鎴栨槸缂╃煭鍚庣殑闀垮害
- * @return 鏂扮殑鎵╁厖鍚庣殑鏁版嵁瀵硅薄
- */
- public static byte[] ArrayExpandToLength(byte[] data,int length){
- if (data == null) return new byte[0];
- byte[] buffer = new byte[length];
- System.arraycopy( data,0, buffer,0, Math.min( data.length, buffer.length ) );
- return buffer;
- }
-
- /**
- * 灏哹yte鏁扮粍鐨勯暱搴︽墿鍏呭埌鍋舵暟闀垮害
- * @param data 鍘熷厛鐨勬暟鎹暱搴�
- * @return 鏂扮殑鎵╁厖鍚庣殑鏁版嵁瀵硅薄
- */
- public static byte[] ArrayExpandToLengthEven( byte[] data )
- {
- if (data == null) data = new byte[0];
- if (data.length % 2 == 1)
- {
- return ArrayExpandToLength(data, data.length + 1 );
- }
- else
- {
- return data;
- }
- }
-
-
-
- /**
- * 灏嗕竴涓暟缁勮繘琛屾墿鍏呭埌鍋舵暟闀垮害
- * @param data 鍘熷厛鏁版嵁鐨勬暟鎹�
- * @param <T> 鏁扮粍鐨勭被鍨�
- * @return 鏂版暟缁勯暱搴︿俊鎭�
- */
- public static <T> T[] ArrayExpandToLengthEven(Class<T> tClass, T[] data )
- {
- if (data == null) data = (T[]) new Object[0];
-
- if (data.length % 2 == 1)
- {
- return ArrayExpandToLength(tClass, data, data.length + 1 );
- }
- else
- {
- return data;
- }
- }
-
- /**
- * 灏嗕竴涓暟缁勮繘琛屾墿鍏呭埌鎸囧畾闀垮害锛屾垨鏄缉鐭埌鎸囧畾闀垮害
- * @param data 鍘熷厛鏁版嵁鐨勬暟鎹�
- * @param length 鏂版暟缁勭殑闀垮害
- * @param <T> 鏁扮粍鐨勭被鍨�
- * @return 鏂版暟缁勯暱搴︿俊鎭�
- */
- public static <T> T[] ArrayExpandToLength(Class<T> tClass, T[] data, int length )
- {
- if (data == null) return (T[]) Array.newInstance(tClass,0);
-
- if (data.length == length) return data;
-
- T[] buffer = (T[]) Array.newInstance(tClass,length);
-
- System.arraycopy( data,0, buffer,0, Math.min( data.length, buffer.length ) );
-
- return buffer;
- }
-
-
-
- /**
- * 鑾峰彇涓�涓插敮涓�鐨勯殢鏈哄瓧绗︿覆锛岄暱搴︿负20锛岀敱Guid鐮佸拰4浣嶆暟鐨勯殢鏈烘暟缁勬垚锛屼繚璇佸瓧绗︿覆鐨勫敮涓�鎬�
- * @return 闅忔満瀛楃涓叉暟鎹�
- */
- public static String GetUniqueStringByGuidAndRandom()
- {
- Random random = new Random();
- return UUID.randomUUID().toString() + (random.nextInt(9000)+1000);
- }
-
-
-
-
- /**
- * 瀛楄妭鏁版嵁杞寲鎴�16杩涘埗琛ㄧず鐨勫瓧绗︿覆
- * @param InBytes 瀛楄妭鏁扮粍
- * @return 杩斿洖鐨勫瓧绗︿覆
- */
- public static String ByteToHexString(byte[] InBytes)
- {
- return ByteToHexString(InBytes, (char)0);
- }
-
-
- /**
- * 瀛楄妭鏁版嵁杞寲鎴�16杩涘埗琛ㄧず鐨勫瓧绗︿覆
- * @param InBytes 瀛楄妭鏁扮粍
- * @param segment 鍒嗗壊绗�
- * @return 杩斿洖鐨勫瓧绗︿覆
- */
- public static String ByteToHexString(byte[] InBytes, char segment)
- {
-
- StringBuilder stringBuilder = new StringBuilder("");
- if (InBytes == null || InBytes.length <= 0) {
- return null;
- }
- for (int i = 0; i < InBytes.length; i++) {
- int v = InBytes[i] & 0xFF;
- String hv = Integer.toHexString(v);
- if (hv.length() < 2) {
- stringBuilder.append(0);
- }
- stringBuilder.append(hv);
- stringBuilder.append(segment);
- }
- return stringBuilder.toString();
- }
-
-
- /**
- *灏哹ool鏁扮粍杞崲鍒癰yte鏁扮粍
- * @param array bool鏁扮粍
- * @return 瀛楄妭鏁扮粍
- */
- public static byte[] BoolArrayToByte(boolean[] array)
- {
- if (array == null) return null;
-
- int length = array.length % 8 == 0 ? array.length / 8 : array.length / 8 + 1;
- byte[] buffer = new byte[length];
-
- for (int i = 0; i < array.length; i++)
- {
- int index = i / 8;
- int offect = i % 8;
-
- byte temp = 0;
- switch (offect)
- {
- case 0: temp = 0x01; break;
- case 1: temp = 0x02; break;
- case 2: temp = 0x04; break;
- case 3: temp = 0x08; break;
- case 4: temp = 0x10; break;
- case 5: temp = 0x20; break;
- case 6: temp = 0x40; break;
- case 7: temp = (byte) 0x80; break;
- default: break;
- }
-
- if (array[i]) buffer[index] += temp;
- }
-
- return buffer;
-
- }
-
-
- /**
- * 浠嶣yte鏁扮粍涓彁鍙栦綅鏁扮粍
- * @param InBytes 鍘熷厛鐨勫瓧鑺傛暟缁�
- * @param length 鎯宠杞崲鐨勯暱搴︼紝濡傛灉瓒呭嚭鑷姩浼氱缉灏忓埌鏁扮粍鏈�澶ч暱搴�
- * @return 缁撴灉瀵硅薄
- */
- public static boolean[] ByteToBoolArray(byte[] InBytes, int length)
- {
- if (InBytes == null) return null;
-
- if (length > InBytes.length * 8) length = InBytes.length * 8;
- boolean[] buffer = new boolean[length];
-
- for (int i = 0; i < length; i++)
- {
- int index = i / 8;
- int offect = i % 8;
-
- byte temp = 0;
- switch (offect)
- {
- case 0: temp = 0x01; break;
- case 1: temp = 0x02; break;
- case 2: temp = 0x04; break;
- case 3: temp = 0x08; break;
- case 4: temp = 0x10; break;
- case 5: temp = 0x20; break;
- case 6: temp = 0x40; break;
- case 7: temp = (byte) 0x80; break;
- default: break;
- }
-
- if ((InBytes[index] & temp) == temp)
- {
- buffer[i] = true;
- }
- }
-
- return buffer;
- }
-
-
- /**
- * 瀛楃涓叉暟鎹浆鍖栨垚16杩涘埗琛ㄧず鐨勫瓧绗︿覆
- * @param InString 杈撳叆鐨勫瓧绗︿覆鏁版嵁
- * @return 杩斿洖鐨勫瓧绗︿覆
- * @throws UnsupportedEncodingException
- */
- public static String ByteToHexString(String InString) throws UnsupportedEncodingException
- {
- return ByteToHexString(InString.getBytes("unicode"));
- }
-
-
- /**
- * 瀹為檯鐨勫瓧绗︿覆鍒楄〃
- */
- private static List<Character> hexCharList = Arrays.asList('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-
-
-
- /**
- * 灏�16杩涘埗鐨勫瓧绗︿覆杞寲鎴怋yte鏁版嵁锛屽皢妫�娴嬫瘡2涓瓧绗﹁浆鍖栵紝涔熷氨鏄锛屼腑闂村彲浠ユ槸浠绘剰瀛楃
- * @param hex 16杩涘埗琛ㄧず鐨勫瓧绗︿覆鏁版嵁
- * @return 瀛楄妭鏁扮粍
- */
- public static byte[] HexStringToBytes(String hex)
- {
- hex = hex.toUpperCase();
-
- ByteArrayOutputStream ms = new ByteArrayOutputStream ();
-
- for (int i = 0; i < hex.length(); i++)
- {
- if ((i + 1) < hex.length())
- {
- if (hexCharList.contains(hex.charAt(i)) && hexCharList.contains(hex.charAt(i+1)))
- {
- // 杩欐槸涓�涓悎鏍肩殑瀛楄妭鏁版嵁
- ms.write((byte)(hexCharList.indexOf(hex.charAt(i)) * 16 +hexCharList.indexOf(hex.charAt(i+1))));
- i++;
- }
- }
- }
-
- byte[] result = ms.toByteArray();
- try {
- ms.close();
- }
- catch (IOException ex)
- {
-
- }
- return result;
- }
-
-
- /**
- * 鎷兼帴2涓瓧鑺傛暟缁勭殑鏁版嵁
- * @param bytes1 鏁扮粍涓�
- * @param bytes2 鏁扮粍浜�
- * @return 鎷兼帴鍚庣殑鏁扮粍
- */
- public static byte[] SpliceTwoByteArray( byte[] bytes1, byte[] bytes2 )
- {
- if (bytes1 == null && bytes2 == null) return null;
- if (bytes1 == null) return bytes2;
- if (bytes2 == null) return bytes1;
-
- byte[] buffer = new byte[bytes1.length + bytes2.length];
- System.arraycopy(bytes1,0,buffer,0,bytes1.length);
- System.arraycopy(bytes2,0,buffer,bytes1.length,bytes2.length);
- return buffer;
- }
-
- /**
- * 灏嗕竴涓猙yte鏁扮粍鐨勫墠闈㈡寚瀹氫綅鏁扮Щ闄わ紝杩斿洖鏂扮殑涓�涓暟缁�
- * @param value 瀛楄妭鏁扮粍
- * @param length 绛夊緟绉婚櫎鐨勯暱搴�
- * @return 鏂扮殑鏁版嵁
- */
- public static byte[] BytesArrayRemoveBegin( byte[] value, int length )
- {
- return BytesArrayRemoveDouble( value, length, 0 );
- }
-
-
- /**
- * 灏嗕竴涓猙yte鏁扮粍鐨勫悗闈㈡寚瀹氫綅鏁扮Щ闄わ紝杩斿洖鏂扮殑涓�涓暟缁�
- * @param value 瀛楄妭鏁扮粍
- * @param length 绛夊緟绉婚櫎鐨勯暱搴�
- * @return 鏂扮殑鏁版嵁
- */
- public static byte[] BytesArrayRemoveLast( byte[] value, int length )
- {
- return BytesArrayRemoveDouble( value, 0, length );
- }
-
- /**
- * 灏嗕竴涓猙yte鏁扮粍鐨勫墠鍚庣Щ闄ゆ寚瀹氫綅鏁帮紝杩斿洖鏂扮殑涓�涓暟缁�
- * @param value 瀛楄妭鏁扮粍
- * @param leftLength 鍓嶉潰鐨勪綅鏁�
- * @param rightLength 鍚庨潰鐨勪綅鏁�
- * @return 鏂扮殑鏁版嵁
- */
- public static byte[] BytesArrayRemoveDouble( byte[] value, int leftLength, int rightLength )
- {
- if (value == null) return null;
- if (value.length <= (leftLength + rightLength)) return new byte[0];
-
- byte[] buffer = new byte[value.length - leftLength - rightLength];
- System.arraycopy( value, leftLength, buffer, 0, buffer.length );
-
- return buffer;
- }
-
-}
-
diff --git a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftIncrementCount.java b/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftIncrementCount.java
deleted file mode 100644
index 7453a89..0000000
--- a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftIncrementCount.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zy.common.HslCommunication.BasicFramework;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 涓�涓畝鍗曠殑涓嶆寔涔呭寲鐨勫簭鍙疯嚜澧炵被锛岄噰鐢ㄧ嚎绋嬪畨鍏ㄥ疄鐜帮紝骞跺厑璁告寚瀹氭渶澶ф暟瀛楋紝鍒拌揪鍚庢竻绌轰粠鎸囧畾鏁板紑濮�
- */
-public class SoftIncrementCount {
-
-
- /**
- * 瀹炰緥鍖栦竴涓嚜澧炰俊鎭殑瀵硅薄锛屽寘鎷渶澶у��
- * @param max 鏁版嵁鐨勬渶澶у�硷紝蹇呴』鎸囧畾
- * @param start 鏁版嵁鐨勮捣濮嬪�硷紝榛樿涓�0
- */
- public SoftIncrementCount( long max, long start )
- {
- this.start = start;
- this.max = max;
- current = start;
- hybirdLock = new ReentrantLock();
- }
-
-
- private long start = 0;
- private long current = 0;
- private long max = Long.MAX_VALUE;
- private Lock hybirdLock;
-
-
- /**
- * 鑾峰彇鑷淇℃伅
- * @return 鍊�
- */
- public long GetCurrentValue( )
- {
- long value = 0;
- hybirdLock.lock( );
-
- value = current;
- current++;
- if (current > max)
- {
- current = 0;
- }
-
- hybirdLock.unlock( );
- return value;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftSecurity.java b/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftSecurity.java
deleted file mode 100644
index 849a914..0000000
--- a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftSecurity.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.common.HslCommunication.BasicFramework;
-
-
-public class SoftSecurity {
-
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftZipped.java b/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftZipped.java
deleted file mode 100644
index 86cef61..0000000
--- a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftZipped.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.zy.common.HslCommunication.BasicFramework;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-public class SoftZipped {
-
- public static byte[] CompressBytes(byte[] data) {
- byte[] b = null;
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- GZIPOutputStream gzip = new GZIPOutputStream(bos);
- gzip.write(data);
- gzip.finish();
- gzip.close();
- b = bos.toByteArray();
- bos.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return b;
- }
-
-
-
- public static byte[] Decompress(byte[] data) {
- byte[] b = null;
- try {
- ByteArrayInputStream bis = new ByteArrayInputStream(data);
- GZIPInputStream gzip = new GZIPInputStream(bis);
- byte[] buf = new byte[1024];
- int num = -1;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- while ((num = gzip.read(buf, 0, buf.length)) != -1) {
- baos.write(buf, 0, num);
- }
- b = baos.toByteArray();
- baos.flush();
- baos.close();
- gzip.close();
- bis.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return b;
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SystemVersion.java b/src/main/java/com/zy/common/HslCommunication/BasicFramework/SystemVersion.java
deleted file mode 100644
index 50e8430..0000000
--- a/src/main/java/com/zy/common/HslCommunication/BasicFramework/SystemVersion.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.zy.common.HslCommunication.BasicFramework;
-
-/**
- * 绯荤粺鐨勭増鏈被
- */
-public class SystemVersion {
-
- /**
- * 鏍规嵁鏍煎紡鍖栧瓧绗︿覆鐨勭増鏈彿鍒濆鍖�
- * @param VersionString 鏍煎紡鍖栫殑瀛楃涓诧紝渚嬪锛�1.0.0鎴�1.0.0.0503
- */
- public SystemVersion(String VersionString)
- {
- String[] temp = VersionString.split("\\.");
- if (temp.length >= 3)
- {
- m_MainVersion = Integer.parseInt(temp[0]);
- m_SecondaryVersion = Integer.parseInt(temp[1]);
- m_EditVersion = Integer.parseInt(temp[2]);
-
- if (temp.length >= 4)
- {
- m_InnerVersion = Integer.parseInt(temp[3]);
- }
- }
- }
-
-
- /**
- * 鏍规嵁鎸囧畾鐨勬暟瀛楀疄渚嬪寲涓�涓璞�
- * @param main 涓荤増鏈�
- * @param sec 娆＄増鏈�
- * @param edit 淇鐗�
- */
- public SystemVersion(int main, int sec, int edit)
- {
- m_MainVersion = main;
- m_SecondaryVersion = sec;
- m_EditVersion = edit;
- }
-
- /**
- * 鏍规嵁鎸囧畾鐨勬暟瀛楀疄渚嬪寲涓�涓璞�
- * @param main 涓荤増鏈�
- * @param sec 娆＄増鏈�
- * @param edit 淇鐗�
- * @param inner 鍐呴儴鐗堟湰鍙�
- */
- public SystemVersion(int main, int sec, int edit, int inner)
- {
- m_MainVersion = main;
- m_SecondaryVersion = sec;
- m_EditVersion = edit;
- m_InnerVersion = inner;
- }
- private int m_MainVersion = 2;
-
-
-
- /**
- * 涓荤増鏈�
- * @return int鏁版嵁
- */
- public int MainVersion()
- {
- return m_MainVersion;
- }
-
- private int m_SecondaryVersion = 0;
-
-
-
- /**
- * 娆＄増鏈�
- * @return int鏁版嵁
- */
- public int SecondaryVersion() {
- return m_SecondaryVersion;
- }
-
- private int m_EditVersion = 0;
-
- /**
- * 淇鐗�
- * @return int鏁版嵁
- */
- public int EditVersion() {
- return m_EditVersion;
- }
- private int m_InnerVersion = 0;
-
-
-
- /**
- * 鍐呴儴鐗堟湰鍙凤紝鎴栬�呮槸鐗堟湰鍙疯〃绀轰负骞存湀浠�+鍐呴儴鐗堟湰鐨勮〃绀烘柟寮�
- * @return int鏁版嵁
- */
- public int InnerVersion()
- {
- return m_InnerVersion;
- }
-
-
-
- /**
- * 鏍规嵁鏍煎紡鍖栦负鏀寔杩斿洖鐨勪笉鍚屼俊鎭殑鐗堟湰鍙�
- * C杩斿洖1.0.0.0
- * N杩斿洖1.0.0
- * S杩斿洖1.0
- * @param format 鏍煎紡鍖栦俊鎭�
- * @return 瀛楃涓叉暟鎹�
- */
- public String toString(String format)
- {
- if(format == "C")
- {
- return MainVersion()+"."+SecondaryVersion()+"."+EditVersion()+"."+InnerVersion();
- }
-
- if(format == "N")
- {
- return MainVersion()+"."+SecondaryVersion()+"."+EditVersion();
- }
-
- if(format == "S")
- {
- return MainVersion()+"."+SecondaryVersion();
- }
-
- return toString();
- }
-
-
- /**
- * 鐗堟湰淇℃伅
- * @return 瀛楃涓叉暟鎹�
- */
- @Override
- public String toString() {
- if(InnerVersion() == 0)
- {
- return MainVersion()+"."+SecondaryVersion()+"."+EditVersion();
- }
- else
- {
- return MainVersion()+"."+SecondaryVersion()+"."+EditVersion()+"."+InnerVersion();
- }
- }
-
-
- /**
- * 鍒ゆ柇鐗堟湰鏄惁涓�鑷�
- * @param sv 瀵规瘮鐨勭増鏈�
- * @return 鏄惁涓�鑷�
- */
- public boolean IsSameVersion(SystemVersion sv) {
- if (this.m_MainVersion != sv.m_MainVersion) {
- return false;
- }
-
- if (this.m_SecondaryVersion != sv.m_SecondaryVersion) {
- return false;
- }
-
- if (this.m_EditVersion != sv.m_EditVersion) {
- return false;
- }
-
- if (this.m_InnerVersion != sv.m_InnerVersion) {
- return false;
- }
-
- return true;
- }
-
- /**
- * 鍒ゆ柇鏄笉鏄皬浜庢寚瀹氱殑鐗堟湰
- * @param sv 瀵规瘮鐨勭増鏈�
- * @return 鏄惁灏忎簬
- */
- public boolean IsSmallerThan(SystemVersion sv) {
- if (this.m_MainVersion < sv.m_MainVersion) {
- return true;
- }
- else if(this.m_MainVersion > sv.m_MainVersion) {
- return false;
- }
-
- if (this.m_SecondaryVersion < sv.m_SecondaryVersion) {
- return true;
- }
- else if (this.m_SecondaryVersion > sv.m_SecondaryVersion) {
- return false;
-
- }
-
- if (this.m_EditVersion < sv.m_EditVersion) {
- return true;
- }
- else if (this.m_EditVersion > sv.m_EditVersion) {
- return false;
- }
-
- if (this.m_InnerVersion < sv.m_InnerVersion) {
- return true;
- }
- else if (this.m_InnerVersion > sv.m_InnerVersion) {
- return false;
- }
-
- return false;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Address/DeviceAddressBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Address/DeviceAddressBase.java
deleted file mode 100644
index 62eb1ab..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Address/DeviceAddressBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.zy.common.HslCommunication.Core.Address;
-
-/**
- * 鎵�鏈夐�氫俊绫荤殑鍦板潃鍩虹被
- */
-public class DeviceAddressBase {
-
-
- /**
- * 鑾峰彇鍦板潃淇℃伅
- * @return
- */
- public int getAddress() {
- return Address;
- }
-
- /**
- * 璁剧疆鍦板潃淇℃伅
- * @param address
- */
- public void setAddress(int address) {
- Address = address;
- }
-
- /**
- * 璧峰鍦板潃
- */
- private int Address = 0;
-
-
- /**
- * 瑙ｆ瀽瀛楃涓茬殑鍦板潃
- *
- * @param address
- */
- public void AnalysisAddress(String address) {
- Address = Integer.parseInt(address);
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return String.valueOf(Address);
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FetchWriteMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FetchWriteMessage.java
deleted file mode 100644
index 4183983..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FetchWriteMessage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-public class FetchWriteMessage implements INetMessage
-{
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 16;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
-
- if(SendBytes == null) return 16;
-
- if(HeadBytes[5]==0x04)
- {
- return 0;
- }
- else {
- return (HeadBytes[12] & 0xff) * 256 + (HeadBytes[13] & 0xff);
- }
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if(HeadBytes == null) return false;
- if(HeadBytes[0]==0x53 && HeadBytes[1] == 0x35){
- return true;
- }
- else {
- return false;
- }
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return HeadBytes[3];
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FinsMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FinsMessage.java
deleted file mode 100644
index c4c3e93..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/FinsMessage.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-import com.zy.common.HslCommunication.Utilities;
-
-public class FinsMessage implements INetMessage
-{
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 8;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
-
- byte[] buffer = new byte[4];
- buffer[0] = HeadBytes[7];
- buffer[1] = HeadBytes[6];
- buffer[2] = HeadBytes[5];
- buffer[3] = HeadBytes[4];
- return Utilities.getInt(buffer,0);
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if(HeadBytes == null) return false;
- if(HeadBytes[0] == 0x46 && HeadBytes[1] == 0x49 && HeadBytes[2] == 0x4E && HeadBytes[3] == 0x53){
- return true;
- }
- else {
- return false;
- }
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return 0;
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/HslMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/HslMessage.java
deleted file mode 100644
index e48e377..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/HslMessage.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * 鏈粍浠剁郴缁熶娇鐢ㄧ殑榛樿鐨勬秷鎭鍒欙紝璇存槑瑙ｆ瀽鍜屽弽瑙ｆ瀽瑙勫垯鐨�
- */
-public class HslMessage implements INetMessage
-{
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 32;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
- if(HeadBytes.length != 32) return 0;
-
- return Utilities.getInt(HeadBytes,28);
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token){
- return SoftBasic.IsTwoBytesEquel(HeadBytes,12,token,0,16);
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return Utilities.getInt(HeadBytes,0);
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/INetMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/INetMessage.java
deleted file mode 100644
index 8d31ba8..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/INetMessage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-/**
- * 鏈郴缁熺殑娑堟伅绫伙紝鍖呭惈浜嗗悇绉嶈В鏋愯鍒欙紝鏁版嵁淇℃伅鎻愬彇瑙勫垯
- */
-public interface INetMessage {
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- int ProtocolHeadBytesLength();
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- int GetContentLengthByHeadBytes();
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- boolean CheckHeadBytesLegal(byte[] token);
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- int GetHeadBytesIdentity();
-
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- void setHeadBytes(byte[] headBytes);
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- * @return
- */
- byte[] getHeadBytes();
-
-
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- * @return
- */
- byte[] getContentBytes();
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- void setContentBytes(byte[] contentBytes);
-
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- * @return
- */
- byte[] getSendBytes();
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- void setSendBytes(byte[] sendBytes);
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecA1EBinaryMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecA1EBinaryMessage.java
deleted file mode 100644
index 2b8cdcf..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecA1EBinaryMessage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-public class MelsecA1EBinaryMessage implements INetMessage {
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 2;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
-
- int contentLength = 0;
-
- if (HeadBytes[1] == 0x5B)
- {
- contentLength = 2; //缁撴潫浠ｇ爜 + 0x00
- return contentLength;
- }
- else
- {
- int length = (SendBytes[10] % 2 == 0) ? SendBytes[10] : SendBytes[10] + 1;
- switch (HeadBytes[0])
- {
- case (byte) 0x80: //浣嶅崟浣嶆垚鎵硅鍑哄悗锛屽洖澶嶅壇鏍囬
- contentLength = length / 2;
- break;
- case (byte) 0x81: //瀛楀崟浣嶆垚鎵硅鍑哄悗锛屽洖澶嶅壇鏍囬
- contentLength = SendBytes[10] * 2;
- break;
- case (byte) 0x82: //浣嶅崟浣嶆垚鎵瑰啓鍏ュ悗锛屽洖澶嶅壇鏍囬
- break;
- case (byte) 0x83: //瀛楀崟浣嶆垚鎵瑰啓鍏ュ悗锛屽洖澶嶅壇鏍囬
- break;
- default:
- break;
- }
- // 鍦ˋ鍏煎1E鍗忚涓紝鍐欏叆鍊煎悗锛岃嫢涓嶅彂鐢熷紓甯革紝鍙繑鍥炲壇鏍囬 + 缁撴潫浠ｇ爜(0x00)
- // 杩欏凡缁忓湪鍗忚澶撮儴璇诲彇杩囦簡锛屽悗闈㈣璇诲彇鐨勯暱搴︿负0锛坈ontentLength=0锛�
- }
- return contentLength;
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if (HeadBytes != null)
- {
- if ((HeadBytes[0] - SendBytes[0]) == (byte) 0x80) { return true; }
- }
- return false;
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return 0;
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EAsciiMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EAsciiMessage.java
deleted file mode 100644
index b80e0c9..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EAsciiMessage.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-import com.zy.common.HslCommunication.Utilities;
-
-public class MelsecQnA3EAsciiMessage implements INetMessage
-{
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 18;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
-
- byte[] buffer = new byte[4];
- buffer[0] = HeadBytes[14];
- buffer[1] = HeadBytes[15];
- buffer[2] = HeadBytes[16];
- buffer[3] = HeadBytes[17];
-
- return Integer.parseInt(Utilities.getString(buffer,"ascii"),16);
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if(HeadBytes == null) return false;
- if(HeadBytes[0] == (byte)'D' && HeadBytes[1] == (byte)'0' && HeadBytes[2] == (byte)'0' && HeadBytes[3] == (byte)'0'){
- return true;
- }
- else {
- return false;
- }
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return 0;
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EBinaryMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EBinaryMessage.java
deleted file mode 100644
index 7cb86c8..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EBinaryMessage.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-public class MelsecQnA3EBinaryMessage implements INetMessage
-{
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 9;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
-
- return (HeadBytes[7]&0xff) + (HeadBytes[8]&0xff)*256;
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if(HeadBytes == null) return false;
- if((HeadBytes[0]&0xff)==0xd0 && HeadBytes[1] == 0x00){
- return true;
- }
- else {
- return false;
- }
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return 0;
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/ModbusTcpMessage.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/ModbusTcpMessage.java
deleted file mode 100644
index 3dfe03e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/ModbusTcpMessage.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-
-/**
- * Modbus Tcp鍗忚鐨勬秷鎭璞★紝鐢ㄦ潵纭畾鎺ユ敹瑙勫垯鐨�
- */
-public class ModbusTcpMessage implements INetMessage
-{
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 8;
- }
-
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes() {
- if (HeadBytes == null) return 0;
- if (HeadBytes.length >= ProtocolHeadBytesLength()) {
- int length = (HeadBytes[4] & 0xff) * 256 + (HeadBytes[5] & 0xff);
- if (length == 0) {
- byte[] buffer = new byte[ProtocolHeadBytesLength() - 1];
- for (int i = 0; i < buffer.length; i++) {
- buffer[i] = HeadBytes[i + 1];
- }
- HeadBytes = buffer;
- return (HeadBytes[5] & 0xff) * 256 + (HeadBytes[6] & 0xff) - 1;
- } else {
- return length - 2;
- }
- }
-
- return 0;
- }
-
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token)
- {
- if(HeadBytes == null) return false;
- if(HeadBytes[2]==0x00 && HeadBytes[3] == 0x00){
- return true;
- }
- else {
- return false;
- }
- }
-
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- * @return
- */
- public int GetHeadBytesIdentity(){
-
- return 0;
- }
-
-
- /**
- * 鑾峰彇娑堟伅澶村瓧鑺�
- *
- * @return
- */
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- /**
- * 鑾峰彇娑堟伅鍐呭瀛楄妭
- *
- * @return
- */
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- /**
- * 鑾峰彇鍙戦�佺殑娑堟伅
- *
- * @return
- */
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- /**
- * 璁剧疆娑堟伅澶村瓙鑺�
- * @param headBytes 瀛楄妭鏁版嵁
- */
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
-
-
-
- /**
- * 璁剧疆娑堟伅鍐呭瀛楄妭
- * @param contentBytes 鍐呭瀛楄妭
- */
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
-
-
- /**
- * 璁剧疆鍙戦�佺殑瀛楄妭淇℃伅
- * @param sendBytes 鍙戦�佺殑瀛楄妭淇℃伅
- */
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-
- private byte[] HeadBytes = null;
-
- private byte[] ContentBytes = null;
-
- private byte[] SendBytes = null;
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/S7Message.java b/src/main/java/com/zy/common/HslCommunication/Core/IMessage/S7Message.java
deleted file mode 100644
index 1cdd04a..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/IMessage/S7Message.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.zy.common.HslCommunication.Core.IMessage;
-
-public class S7Message implements INetMessage {
-
- // 澶村瓧鑺�
- private byte[] HeadBytes = null;
-
- // 娑堟伅鍐呭瀛楄妭
- private byte[] ContentBytes = null;
-
- // 鍙戦�佺殑娑堟伅
- private byte[] SendBytes = null;
-
- /**
- * 娑堟伅澶寸殑鎸囦护闀垮害
- */
- public int ProtocolHeadBytesLength(){
- return 4;
- }
-
- /**
- * 浠庡綋鍓嶇殑澶村瓙鑺傛枃浠朵腑鎻愬彇鍑烘帴涓嬫潵闇�瑕佹帴鏀剁殑鏁版嵁闀垮害
- * @return 杩斿洖鎺ヤ笅鏉ョ殑鏁版嵁鍐呭闀垮害
- */
- public int GetContentLengthByHeadBytes(){
- if(HeadBytes == null) return 0;
- return (HeadBytes[2] & 0xff) * 256 + (HeadBytes[3] & 0xff) - 4;
- }
-
- /**
- * 妫�鏌ュご瀛愯妭鐨勫悎娉曟��
- * @param token 鐗规畩鐨勪护鐗岋紝鏈変簺鐗规畩娑堟伅鐨勯獙璇�
- * @return 鏄惁鍚堟硶鐨勯獙璇�
- */
- public boolean CheckHeadBytesLegal(byte[] token) {
- if(HeadBytes == null) return false;
- return HeadBytes[0] == 0x03 && HeadBytes[1] == 0x00;
- }
-
- /**
- * 鑾峰彇澶村瓙鑺傞噷鐨勬秷鎭爣璇�
- */
- public int GetHeadBytesIdentity(){
- return 0;
- }
-
- @Override
- public byte[] getHeadBytes() {
- return HeadBytes;
- }
-
- @Override
- public byte[] getContentBytes() {
- return ContentBytes;
- }
-
- @Override
- public byte[] getSendBytes() {
- return SendBytes;
- }
-
- public void setHeadBytes(byte[] headBytes){
- HeadBytes = headBytes;
- }
-
- public void setContentBytes(byte[] contentBytes){
- ContentBytes = contentBytes;
- }
-
- public void setSendBytes(byte[] sendBytes){
- SendBytes = sendBytes;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/HslProtocol.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/HslProtocol.java
deleted file mode 100644
index d71f4c6..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/HslProtocol.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net;
-
-import com.zy.common.HslCommunication.BasicFramework.*;
-import com.zy.common.HslCommunication.Core.Security.HslSecurity;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.util.UUID;
-
-public class HslProtocol
-{
-
- /**
- * 瑙勫畾鎵�鏈夌殑缃戠粶浼犺緭鐨勬寚浠ゅご闀垮害
- */
- public static final int HeadByteLength = 32;
-
- /**
- * 鎵�鏈夌綉缁滈�氫俊涓殑缂撳啿姹犵殑鏁版嵁淇℃伅
- */
- public static final int ProtocolBufferSize = 1024;
-
- /**
- * 鐢ㄤ簬蹇冭烦绋嬪簭鐨勬殫鍙蜂俊鎭�
- */
- public static final int ProtocolCheckSecends = 1;
-
- /**
- * 瀹㈡埛绔��鍑虹殑娑堟伅
- */
- public static final int ProtocolClientQuit = 2;
-
- /**
- * 鍥犱负瀹㈡埛绔揪鍒颁笂闄愯�屾嫆缁濈櫥褰�
- */
- public static final int ProtocolClientRefuseLogin = 3;
-
- /**
- * 鍏佽瀹㈡埛绔櫥褰曞埌鏈嶅姟鍣�
- */
- public static final int ProtocolClientAllowLogin = 4;
-
- /**
- * 璇存槑鍙戦�佺殑淇℃伅鏄枃鏈暟鎹�
- */
- public static final int ProtocolUserString = 1001;
-
- /**
- * 璇存槑鍙戦�佺殑淇℃伅鏄瓧鑺傛暟缁勬暟鎹�
- */
- public static final int ProtocolUserBytes = 1002;
-
- /**
- * 鍙戦�佺殑鏁版嵁鏄櫘閫氱殑鍥剧墖鏁版嵁
- */
- public static final int ProtocolUserBitmap = 1003;
-
- /**
- * 鍙戦�佺殑鏁版嵁鏄竴鏉″紓甯哥殑鏁版嵁锛屽瓧绗︿覆涓哄紓甯告秷鎭�
- */
- public static final int ProtocolUserException = 1004;
-
- /**
- * 璇锋眰鏂囦欢涓嬭浇鐨勬殫鍙�
- */
- public static final int ProtocolFileDownload = 2001;
-
- /**
- * 璇锋眰鏂囦欢涓婁紶鐨勬殫鍙�
- */
- public static final int ProtocolFileUpload = 2002;
-
- /**
- * 璇锋眰鍒犻櫎鏂囦欢鐨勬殫鍙�
- */
- public static final int ProtocolFileDelete = 2003;
-
- /**
- * 鏂囦欢鏍￠獙鎴愬姛
- */
- public static final int ProtocolFileCheckRight = 2004;
-
- /**
- * 鏂囦欢鏍￠獙澶辫触
- */
- public static final int ProtocolFileCheckError = 2005;
-
- /**
- * 鏂囦欢淇濆瓨澶辫触
- */
- public static final int ProtocolFileSaveError = 2006;
-
- /**
- * 璇锋眰鏂囦欢鐨勫垪琛ㄧ殑鏆楀彿
- */
- public static final int ProtocolFileDirectoryFiles = 2007;
-
- /**
- * 璇锋眰瀛愭枃浠剁殑鍒楄〃鏆楀彿
- */
- public static final int ProtocolFileDirectories = 2008;
-
- /**
- * 杩涘害杩斿洖鏆楀彿
- */
- public static final int ProtocolProgressReport = 2009;
-
-
- /**
- * 涓嶅帇缂╁瓧鑺傛暟鎹�
- */
- public static final int ProtocolNoZipped = 3001;
-
- /**
- * 鍘嬬缉瀛楄妭鏁版嵁
- */
- public static final int ProtocolZipped = 3002;
-
-
-
- /**
- * 鐢熸垚缁堟瀬浼犻�佹寚浠ょ殑鏂规硶锛屾墍鏈夌殑鏁版嵁鍧囬�氳繃璇ユ柟娉曞嚭鏉�
- * @param command 鍛戒护澶�
- * @param customer 鑷敤鑷畾涔�
- * @param token 浠ょ墝
- * @param data 瀛楄妭鏁版嵁
- * @return 鍙戦�佺殑娑堟伅鏁版嵁
- */
- public static byte[] CommandBytes(int command, int customer, UUID token, byte[] data )
- {
- byte[] _temp = null;
- int _zipped = ProtocolNoZipped;
- int _sendLength = 0;
- if (data == null)
- {
- _temp = new byte[HeadByteLength];
- }
- else
- {
- // 鍔犲瘑
- data = HslSecurity.ByteEncrypt(data);
- if (data.length > 10240)
- {
- // 10K浠ヤ笂鐨勬暟鎹紝杩涜鏁版嵁鍘嬬缉
- data = SoftZipped.CompressBytes(data);
- _zipped = ProtocolZipped;
- }
- _temp = new byte[HeadByteLength + data.length];
- _sendLength = data.length;
- }
-
- Utilities.getBytes(command);
-
- System.arraycopy(Utilities.getBytes(command),0,_temp,0,4);
- System.arraycopy(Utilities.getBytes(customer),0,_temp,4,4);
- System.arraycopy(Utilities.getBytes(_zipped),0,_temp,8,4);
- System.arraycopy(Utilities.UUID2Byte(token),0,_temp,12,16);
- System.arraycopy(Utilities.getBytes(_sendLength),0,_temp,28,4);
- if (_sendLength > 0)
- {
- System.arraycopy(data,0,_temp,32,_sendLength);
- }
- return _temp;
- }
-
-
- /**
- * 瑙ｆ瀽鎺ユ敹鍒版暟鎹紝鍏堣В鍘嬬缉鍚庤繘琛岃В瀵�
- * @param head
- * @param content
- * @return
- */
- public static byte[] CommandAnalysis( byte[] head, byte[] content )
- {
- if (content != null)
- {
- byte[] buffer = new byte[4];
- buffer[0] = head[8];
- buffer[1] = head[9];
- buffer[2] = head[10];
- buffer[3] = head[11];
-
- // 鑾峰彇鏄惁鍘嬬缉鐨勬儏鍐�
- int _zipped = Utilities.getInt(buffer,0);
-
-
- // 鍏堣繘琛岃В鍘�
- if (_zipped == ProtocolZipped)
- {
- content = SoftZipped.Decompress( content );
- }
- // 杩涜瑙ｅ瘑
- return HslSecurity.ByteDecrypt( content );
- }
- else
- {
- return null;
- }
- }
-
-
-
- /**
- * 鑾峰彇鍙戦�佸瓧鑺傛暟鎹殑瀹為檯鏁版嵁锛屽甫鎸囦护澶�
- * @param customer
- * @param token
- * @param data
- * @return
- */
- public static byte[] CommandBytes( int customer, UUID token, byte[] data )
- {
- return CommandBytes( ProtocolUserBytes, customer, token, data );
- }
-
-
- /**
- * 鑾峰彇鍙戦�佸瓧鑺傛暟鎹殑瀹為檯鏁版嵁锛屽甫鎸囦护澶�
- * @param customer
- * @param token
- * @param data
- * @return
- */
- public static byte[] CommandBytes( int customer, UUID token, String data )
- {
- if (data == null) return CommandBytes( ProtocolUserString, customer, token, null );
- else return CommandBytes( ProtocolUserString, customer, token, Utilities.string2Byte(data) );
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/IReadWriteNet.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/IReadWriteNet.java
deleted file mode 100644
index bcca73e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/IReadWriteNet.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net;
-
-import com.zy.common.HslCommunication.Core.Types.IDataTransfer;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-
-/**
- * 鎵�鏈夎澶囦氦浜掔被鐨勭粺涓�鐨勮鍐欐帴鍙�
- */
-public interface IReadWriteNet {
-
- /**
- * 鎵归噺璇诲彇搴曞眰鐨勬暟鎹俊鎭紝闇�瑕佹寚瀹氬湴鍧�鍜岄暱搴︼紝鍏蜂綋鐨勭粨鏋滃彇鍐充簬瀹炵幇
- * @param address 鍦板潃淇℃伅
- * @param length 鏁版嵁闀垮害
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨刡yte[]鏁扮粍
- */
- OperateResultExOne<byte[]> Read(String address, short length );
-
- /**
- * 璇诲彇16浣嶇殑鏈夌鍙锋暣鍨�
- * @param address 璧峰鍦板潃
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨剆hort鏁版嵁
- */
- OperateResultExOne<Short> ReadInt16(String address);
-
- /**
- * 璇诲彇16浣嶇殑鏈夌鍙锋暣鍨嬫暟缁�
- * @param address 璧峰鍦板潃
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨剆hort鏁扮粍
- */
- OperateResultExOne<short []> ReadInt16( String address, short length );
-
- /**
- * 璇诲彇32浣嶇殑鏈夌鍙锋暣鍨�
- * @param address 璧峰鍦板潃
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨刬nt鏁版嵁
- */
- OperateResultExOne<Integer> ReadInt32(String address);
-
- /**
- * 璇诲彇32浣嶆湁绗﹀彿鏁村瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- OperateResultExOne<int[]> ReadInt32( String address, short length );
-
- /**
- * 璇诲彇64浣嶇殑鏈夌鍙锋暣鍨�
- * @param address 璧峰鍦板潃
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨刲ong鏁版嵁
- */
- OperateResultExOne<Long> ReadInt64(String address);
-
- /**
- * 璇诲彇64浣嶇殑鏈夌鍙锋暣鍨嬫暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- OperateResultExOne<long[]> ReadInt64( String address, short length );
-
- /**
- * 璇诲彇鍗曟诞鐐圭簿搴︾殑鏁版嵁
- * @param address 璧峰鍦板潃
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨刦loat鏁版嵁
- */
- OperateResultExOne<Float> ReadFloat(String address);
-
- /**
- * 璇诲彇鍗曟诞鐐圭簿搴︾殑鏁扮粍
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- OperateResultExOne<float[]> ReadFloat( String address, short length );
-
- /**
- * 璇诲彇鍙屾诞鐐圭簿搴︾殑鏁版嵁
- * @param address 璧峰鍦板潃
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨刣ouble鏁版嵁
- */
- OperateResultExOne<Double> ReadDouble(String address);
-
-
- /**
- * 璇诲彇鍙屾诞鐐圭簿搴︾殑鏁版嵁鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- OperateResultExOne<double[]> ReadDouble( String address, short length );
-
- /**
- * 璇诲彇瀛楃涓叉暟鎹�
- * @param address 璧峰鍦板潃
- * @param length 鏁版嵁闀垮害
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨剆tring鏁版嵁
- */
- OperateResultExOne<String> ReadString(String address, short length);
-
-
- /**
- * 璇诲彇鑷畾涔夌殑鏁版嵁绫诲瀷锛岄渶瑕佺户鎵胯嚜IDataTransfer鎺ュ彛
- * @param address 璧峰鍦板潃
- * @param <T> 鑷畾涔夌殑绫诲瀷
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勮嚜瀹氫箟绫诲瀷鏁版嵁
- */
- <T extends IDataTransfer> OperateResultExOne<T> ReadCustomer(String address,Class<T> tClass);
-
-
-
-
-
-
-
-
- /**
- * 鍐欏叆short鏁版嵁
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, short value);
-
- /**
- * 鍐欏叆short鏁扮粍
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, short[] values);
-
- /**
- * 鍐欏叆int鏁版嵁
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, int value);
-
- /**
- * 鍐欏叆int[]鏁扮粍
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, int[] values);
-
- /**
- * 鍐欏叆long鏁版嵁
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, long value);
-
- /**
- * 鍐欏叆long鏁扮粍
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, long[] values);
-
- /**
- * 鍐欏叆float鏁版嵁
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, float value);
-
- /**
- * 鍐欏叆float鏁扮粍
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, float[] values);
-
- /**
- * 鍐欏叆double鏁版嵁
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, double value);
-
- /**
- * 鍐欏叆double鏁扮粍
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, double[] values);
-
- /**
- * 鍐欏叆瀛楃涓蹭俊鎭紝缂栫爜涓篈SCII
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, String value);
-
-
- /**
- * 鍐欏叆瀛楃涓蹭俊鎭紝缂栫爜涓篈SCII
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @param length 鍐欏叆鐨勫瓧绗︿覆鐨勯暱搴�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- OperateResult Write(String address, String value, int length);
-
- /**
- * 鍐欏叆鑷畾涔夌被鍨嬬殑鏁版嵁锛岃绫诲瀷蹇呴』缁ф壙鑷狪DataTransfer鎺ュ彛
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @param <T> 绫诲瀷瀵硅薄
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滅被瀵硅薄
- */
- <T extends IDataTransfer> OperateResult WriteCustomer(String address, T value);
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetHandle.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/NetHandle.java
deleted file mode 100644
index d0b200c..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetHandle.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net;
-
-import com.zy.common.HslCommunication.Utilities;
-
-
-/**
- * 鐢ㄤ簬閫氫俊杩囩▼涓殑鏆楀彿瀵硅薄
- */
-public final class NetHandle {
-
-
- /**
- * 鍒濆鍖栦竴涓殫鍙峰璞�
- * @param value int鍊�
- */
- public NetHandle(int value)
- {
- byte[] buffer = Utilities.getBytes(value);
-
- m_CodeMajor = buffer[3];
- m_CodeMinor = buffer[2];
- m_CodeIdentifier = Utilities.getShort(buffer,0);
-
-
- m_CodeValue = value;
- }
-
-
-
- /**
- * 鏍规嵁涓変釜鍊兼潵鍒濆鍖栨殫鍙峰璞�
- * @param major 涓绘殫鍙�
- * @param minor 涓绘殫鍙�
- * @param identifier 鏆楀彿缂栧彿
- */
- public NetHandle(int major, int minor, int identifier)
- {
- m_CodeValue = 0;
-
- byte[] buffer_major=Utilities.getBytes(major);
- byte[] buffer_minor=Utilities.getBytes(minor);
- byte[] buffer_identifier=Utilities.getBytes(identifier);
-
- m_CodeMajor = buffer_major[0];
- m_CodeMinor = buffer_minor[0];
- m_CodeIdentifier = Utilities.getShort(buffer_identifier,0);
-
- byte[] buffer = new byte[4];
- buffer[3] = m_CodeMajor;
- buffer[2] = m_CodeMinor;
- buffer[1] = buffer_identifier[1];
- buffer[0] = buffer_identifier[0];
-
- m_CodeValue = Utilities.getInt(buffer,0);
- }
-
-
- /**
- * 瀹屾暣鐨勬殫鍙峰��
- */
- private int m_CodeValue;
-
- /**
- * 涓绘殫鍙峰垎绫�0-255
- */
- private byte m_CodeMajor;
-
- /**
- * 娆¤鐨勬殫鍙峰垎绫�0-255
- */
- private byte m_CodeMinor;
-
- /**
- * 鏆楀彿鐨勭紪鍙峰垎绫�0-65535
- */
- private short m_CodeIdentifier;
-
-
-
- /**
- * 鑾峰彇瀹屾暣鐨勬殫鍙峰��
- * @return
- */
- public int get_CodeValue(){
- return m_CodeValue;
- }
-
-
- /**
- * 鑾峰彇涓绘殫鍙峰垎绫�0-255
- * @return 涓绘殫鍙�
- */
- public byte get_CodeMajor() {
- return m_CodeMajor;
- }
-
-
- /**
- * 鑾峰彇娆¤鐨勬殫鍙峰垎绫�0-255
- * @return 娆℃殫鍙�
- */
- public byte get_CodeMinor() {
- return m_CodeMinor;
- }
-
-
- /**
- * 鑾峰彇鏆楀彿鐨勭紪鍙峰垎绫�0-65535
- * @return 缂栧彿鍒嗙被
- */
- public short get_CodeIdentifier() {
- return m_CodeIdentifier;
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkBase.java
deleted file mode 100644
index 4d847be..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkBase.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.NetworkBase;
-
-import com.zy.common.HslCommunication.Core.IMessage.INetMessage;
-import com.zy.common.HslCommunication.Core.Types.HslTimeOut;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.LogNet.Core.ILogNet;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.util.Date;
-import java.util.UUID;
-
-
-/**
- * 鏈郴缁熸墍鏈夌綉缁滅被鐨勫熀绫伙紝璇ョ被涓烘娊璞＄被锛屾棤娉曡繘琛屽疄渚嬪寲
- */
-public abstract class NetworkBase {
-
- /**
- * 瀹炰緥鍖栦竴涓狽etworkBase瀵硅薄
- */
- public NetworkBase( )
- {
- Token = UUID.fromString("00000000-0000-0000-0000-000000000000");
- }
-
-
-
- /**
- * 閫氳绫荤殑鏍稿績濂楁帴瀛�
- */
- protected Socket CoreSocket = null;
-
-
- /**
- * 绾跨▼妫�鏌ユ槸鍚﹀彂鐢熶簡瓒呮椂鐨勬柟娉�
- * @param timeout
- * @param millisecond
- */
- public static void ThreadPoolCheckConnect(HslTimeOut timeout, int millisecond) {
- while (!timeout.IsSuccessful) {
- if ((new Date().getTime() - timeout.StartTime.getTime()) > millisecond) {
- // 杩炴帴瓒呮椂鎴栨槸楠岃瘉瓒呮椂
- if (!timeout.IsSuccessful) {
- try {
- if (timeout.WorkSocket != null) {
- timeout.WorkSocket.close();
- }
- } catch (IOException ex) {
- // 涓嶅鐞嗭紝鏀惧純
- }
- }
- break;
- }
- }
- }
-
-
- /**
- * 浠庡鎺ュ瓧鎺ユ敹瀹氶暱搴︾殑瀛楄妭鏁扮粍
- * @param socket 濂楁帴瀛�
- * @param length 鏁版嵁闀垮害
- * @return 娑堟伅绫诲璞�
- */
- protected OperateResultExOne<byte[]> Receive(Socket socket, int length, int timeout )
- {
- OperateResultExOne<byte[]> resultExOne = new OperateResultExOne<>();
-
- if (length == 0) {
- resultExOne.IsSuccess = true;
- resultExOne.Content = new byte[0];
- return resultExOne;
- }
-
- int count_receive = 0;
- byte[] bytes_receive = new byte[length];
- try {
- if(timeout>0) socket.setSoTimeout(timeout);
- InputStream input = socket.getInputStream();
- while (count_receive<length)
- {
- count_receive += input.read(bytes_receive, count_receive, length-count_receive);
- }
- }
- catch (IOException ex)
- {
- CloseSocket(socket);
- resultExOne.Message = ex.getMessage();
- return resultExOne;
- }
-
- resultExOne.IsSuccess = true;
- resultExOne.Content = bytes_receive;
- return resultExOne;
- }
-
- /**
- * 浠庡鎺ュ瓧鎺ユ敹瀹氶暱搴︾殑瀛楄妭鏁扮粍
- * @param socket 濂楁帴瀛�
- * @param length 鏁版嵁闀垮害
- * @return 娑堟伅绫诲璞�
- */
- protected OperateResultExOne<byte[]> Receive(Socket socket, int length )
- {
- return Receive(socket,length,-1);
- }
-
-
- /**
- * 浠庡鎺ュ瓧鎺ユ敹鎸囧畾闀垮害鐨勫瓧鑺傛暟鎹�
- * @param socket 缃戠粶濂楁帴瀛�
- * @param timeOut 瓒呮椂鏃堕棿
- * @param netMsg 娑堟伅鏍煎紡
- * @param <TNetMessage> 绫诲瀷
- * @return 娑堟伅绫�
- */
- protected <TNetMessage extends INetMessage> OperateResultExOne<TNetMessage> ReceiveMessage(Socket socket, int timeOut, TNetMessage netMsg)
- {
- OperateResultExOne<TNetMessage> resultExOne = new OperateResultExOne<>();
-
- // 鎺ユ敹鎸囦护澶�
- OperateResultExOne<byte[]> headResult = Receive( socket, netMsg.ProtocolHeadBytesLength(), timeOut );
- if (!headResult.IsSuccess)
- {
- resultExOne.CopyErrorFromOther( headResult );
- return resultExOne;
- }
-
- netMsg.setHeadBytes( headResult.Content );
- if (!netMsg.CheckHeadBytesLegal(Utilities.UUID2Byte(Token)))
- {
- // 浠ょ墝鏍￠獙澶辫触
- CloseSocket(socket);
- if(LogNet != null) LogNet.WriteError( toString( ), StringResources.Language.TokenCheckFailed() );
- resultExOne.Message = StringResources.Language.TokenCheckFailed();
- return resultExOne;
- }
-
-
- int contentLength = netMsg.GetContentLengthByHeadBytes( );
- if (contentLength == 0)
- {
- netMsg.setContentBytes( new byte[0] );
- }
- else
- {
- OperateResultExOne<byte[]> contentResult = Receive( socket, contentLength, timeOut );
- if (!contentResult.IsSuccess)
- {
- resultExOne.CopyErrorFromOther( contentResult );
- return resultExOne;
- }
-
- netMsg.setContentBytes( contentResult.Content);
- }
-
- // 闃叉娌℃湁瀹炰緥鍖栭�犳垚鍚庣画鐨勬搷浣滃け璐�
- if (netMsg.getContentBytes() == null){ netMsg.setContentBytes( new byte[0]);}
- resultExOne.Content = netMsg;
- resultExOne.IsSuccess = true;
- return resultExOne;
- }
-
-
- /**
- * 鍙戦�佷竴涓叉暟鎹埌缃戠粶濂楁帴瀛椾腑
- * @param socket 缃戠粶濂楁帴瀛�
- * @param data 鏁版嵁
- * @return 鏄惁鍙戦�佹垚鍔�
- */
- protected OperateResult Send(Socket socket,byte[] data){
- OperateResult result = new OperateResult();
- if(data == null) {
- result.IsSuccess = true;
- return result;
- }
- try {
- DataOutputStream output = new DataOutputStream(socket.getOutputStream());
- output.write(data, 0, data.length);
- }
- catch (IOException ex)
- {
- result.Message = ex.getMessage();
- return result;
- }
-
- result.IsSuccess = true;
- return result;
- }
-
-
- /**
- * 鍒涘缓涓�涓鎺ュ瓧骞朵笖杩炴帴鍒版湇鍔″櫒
- * @param endPoint 鐩爣鑺傜偣
- * @param timeOut 瓒呮椂鏃堕棿
- * @return 杩炴帴鎴愬姛鐨勬爣蹇�
- */
- protected OperateResultExOne<Socket> CreateSocketAndConnect(SocketAddress endPoint, int timeOut){
- OperateResultExOne<Socket> operateResultExOne = new OperateResultExOne<>();
-
- Socket socket = new Socket();
- try {
- socket.connect(endPoint,timeOut);
- operateResultExOne.Content = socket;
- operateResultExOne.IsSuccess = true;
- }
- catch (IOException ex)
- {
- operateResultExOne.Message = ex.getMessage();
- CloseSocket(socket);
- }
-
- return operateResultExOne;
- }
-
- /**
- * 鍒涘缓涓�涓鎺ュ瓧骞朵笖杩炴帴鍒版湇鍔″櫒
- * @param ipAddress ip鍦板潃
- * @param port 绔彛鍙�
- * @param timeOut 瓒呮椂鏃堕棿
- * @return 杩炴帴鎴愬姛鐨勬爣蹇�
- */
- protected OperateResultExOne<Socket> CreateSocketAndConnect(String ipAddress,int port, int timeOut) {
- SocketAddress endPoint = new InetSocketAddress(ipAddress,port);
- return CreateSocketAndConnect(endPoint,timeOut);
- }
-
-
- /**
- * 璇诲彇娴佷腑鐨勬暟鎹埌缂撳瓨鍖�
- * @param stream 娴佹暟鎹�
- * @param buffer 缂撳啿鏁版嵁
- * @return
- */
- protected OperateResultExOne<Integer> ReadStream(InputStream stream, byte[] buffer) {
- OperateResultExOne<Integer> resultExOne = new OperateResultExOne<>();
- int read_count = 0;
- try {
- while (read_count < buffer.length) {
- read_count += stream.read(buffer, read_count, buffer.length - read_count);
- }
- resultExOne.Content = read_count;
- resultExOne.IsSuccess = true;
- } catch (IOException ex) {
- resultExOne.Message = ex.getMessage();
- }
-
- return resultExOne;
- }
-
-
- /**
- * 灏嗗瓧鑺傛祦鏁版嵁鍐欏叆鍒拌緭鍑烘祦閲岄潰鍘�
- * @param stream 瀛楄妭娴�
- * @param buffer 缂撳瓨鏁版嵁
- * @return 鍐欏叆鏄惁鎴愬姛
- */
- protected OperateResult WriteStream(OutputStream stream, byte[] buffer ) {
- OperateResult result = new OperateResultExOne<>();
- try {
- stream.write(buffer, 0, buffer.length);
- result.IsSuccess = true;
- } catch (IOException ex) {
- result.Message = ex.getMessage();
- }
-
- return result;
- }
-
-
- /**
- * 瀹夊叏鐨勫叧闂竴涓鎺ュ瓧
- * @param socket 缃戠粶濂楁帴瀛�
- */
- protected void CloseSocket(Socket socket){
- if(socket != null){
- try {
- socket.close();
- }
- catch (Exception ex){
-
- }
- }
- }
-
-
- /**
- * 缁勪欢鐨勬棩蹇楀伐鍏凤紝鏀寔鏃ュ織璁板綍
- */
- public ILogNet LogNet = null;
-
- /**
- * 缃戠粶绫荤殑韬唤浠ょ墝
- */
- public UUID Token = null;
-
-
-
- /**
- * 杩斿洖瀵硅薄鐨勫瓧绗︿覆琛ㄧず褰㈠紡
- * @return 瀛楃涓�
- */
- @Override
- public String toString(){
- return "NetworkBase";
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDeviceBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDeviceBase.java
deleted file mode 100644
index bb451b6..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDeviceBase.java
+++ /dev/null
@@ -1,444 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.NetworkBase;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.IMessage.INetMessage;
-import com.zy.common.HslCommunication.Core.Net.IReadWriteNet;
-import com.zy.common.HslCommunication.Core.Transfer.IByteTransform;
-import com.zy.common.HslCommunication.Core.Types.IDataTransfer;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Utilities;
-
-
-/**
- * 璁惧绫荤殑鍩虹被锛屾彁渚涗簡鍩虹鐨勫瓧鑺傝鍐欐柟娉曪紝閲囩敤娉涘瀷缁ф壙瀹炵幇
- * @param <TNetMessage> 娑堟伅绫诲瀷
- * @param <TTransform> 鍙樻崲绫诲瀷
- */
-public class NetworkDeviceBase<TNetMessage extends INetMessage,TTransform extends IByteTransform> extends NetworkDoubleBase<TNetMessage,TTransform> implements IReadWriteNet
-{
-
-
-
- /**************************************************************************************************
- *
- * 璇存槑锛氬瓙绫讳腑闇�瑕侀噸鍐欏熀纭�鐨勮鍙栧拰鍐欏叆鏂规硶锛屾潵鏀寔涓嶅悓鐨勬暟鎹闂鍒�
- *
- * 姝ゅ娌℃湁灏嗚鍐欎綅绾冲叆杩涙潵锛屽洜涓哄悇绉嶈澶囩殑鏀寔涓嶅敖鐩稿悓锛屾瘮杈冮夯鐑�
- *
- **************************************************************************************************/
-
- protected short WordLength = 1;
-
-
- /**
- * 浠庤澶囪鍙栧師濮嬫暟鎹�
- * @param address 鍦板潃淇℃伅
- * @param length 鏁版嵁闀垮害
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滃璞�
- */
- public OperateResultExOne<byte[]> Read(String address, short length) {
- return new OperateResultExOne<byte[]>();
- }
-
-
- /**
- * 灏嗗師濮嬫暟鎹啓鍏ヨ澶�
- * @param address 璧峰鍦板潃
- * @param value 鍘熷鏁版嵁
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滃璞�
- */
- public OperateResult Write(String address, byte[] value) {
- return new OperateResult();
- }
-
-
-
-
-
- /**
- * 璇诲彇鑷畾涔夌被鍨嬬殑鏁版嵁锛岄渶瑕佽瀹氳В鏋愯鍒�
- * @param address 璧峰鍦板潃
- * @param tClass 绫�
- * @param <T> 绫诲瀷鍚嶇О
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滃璞�
- */
- public <T extends IDataTransfer> OperateResultExOne<T> ReadCustomer(String address ,Class<T> tClass)
- {
- OperateResultExOne<T> result = new OperateResultExOne<T>();
- T Content;
- try {
- Content = tClass.newInstance();
- }
- catch (Exception ex){
- Content = null;
- }
- OperateResultExOne<byte[]> read = Read(address, Content.getReadCount());
- if (read.IsSuccess) {
- Content.ParseSource(read.Content);
- result.Content = Content;
- result.IsSuccess = true;
- } else {
- result.ErrorCode = read.ErrorCode;
- result.Message = read.Message;
- }
- return result;
- }
-
-
- /**
- * 鍐欏叆鑷畾涔夌被鍨嬬殑鏁版嵁鍒拌澶囧幓锛岄渶瑕佽瀹氱敓鎴愬瓧鑺傜殑鏂规硶
- * @param address 璧峰鍦板潃
- * @param data 瀹炰緥瀵硅薄
- * @param <T> 鑷畾涔夌被鍨�
- * @return 甯︽湁鎴愬姛鏍囪瘑鐨勭粨鏋滃璞�
- */
- public <T extends IDataTransfer> OperateResult WriteCustomer(String address, T data )
- {
- return Write(address, data.ToSource());
- }
-
-
- /**
- * 璇诲彇璁惧鐨剆hort绫诲瀷鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Short> ReadInt16(String address) {
- return GetInt16ResultFromBytes(Read(address, WordLength));
- }
-
-
- /**
- * 璇诲彇璁惧鐨剆hort绫诲瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<short[]> ReadInt16(String address, short length) {
- OperateResultExOne<byte[]> read = Read(address, (short) (length * WordLength));
- if (!read.IsSuccess) {
- OperateResultExOne<short[]> result = new OperateResultExOne<short[]>();
- result.CopyErrorFromOther(read);
- return result;
- }
- return OperateResultExOne.CreateSuccessResult(super.getByteTransform().TransInt16(read.Content, 0, length));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刬nt绫诲瀷鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Integer> ReadInt32(String address) {
- return GetInt32ResultFromBytes(Read(address, (short) (2 * WordLength)));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刬nt绫诲瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<int[]> ReadInt32(String address, short length) {
- OperateResultExOne<byte[]> read = Read(address, (short) (length * WordLength * 2));
- if (!read.IsSuccess) {
- OperateResultExOne<int[]> result = new OperateResultExOne<int[]>();
- result.CopyErrorFromOther(read);
- return result;
- }
- return OperateResultExOne.CreateSuccessResult(super.getByteTransform().TransInt32(read.Content, 0, length));
- }
-
-
- /**
- * 璇诲彇璁惧鐨刦loat绫诲瀷鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Float> ReadFloat(String address) {
- return GetSingleResultFromBytes(Read(address, (short) (2 * WordLength)));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刦loat绫诲瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<float[]> ReadFloat(String address, short length) {
- OperateResultExOne<byte[]> read = Read(address, (short) (length * WordLength * 2));
- if (!read.IsSuccess) {
- OperateResultExOne<float[]> result = new OperateResultExOne<float[]>();
- result.CopyErrorFromOther(read);
- return result;
- }
- return OperateResultExOne.CreateSuccessResult(super.getByteTransform().TransSingle(read.Content, 0, length));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刲ong绫诲瀷鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Long> ReadInt64(String address) {
- return GetInt64ResultFromBytes(Read(address, (short) (4 * WordLength)));
- }
-
-
- /**
- * 璇诲彇璁惧鐨刲ong绫诲瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<long[]> ReadInt64(String address, short length) {
- OperateResultExOne<byte[]> read = Read(address, (short) (length * WordLength * 4));
- if (!read.IsSuccess) {
- OperateResultExOne<long[]> result = new OperateResultExOne<long[]>();
- result.CopyErrorFromOther(read);
- return result;
- }
- return OperateResultExOne.CreateSuccessResult(super.getByteTransform().TransInt64(read.Content, 0, length));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刣ouble绫诲瀷鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Double> ReadDouble(String address) {
- return GetDoubleResultFromBytes(Read(address, (short) (4 * WordLength)));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨刣ouble绫诲瀷鐨勬暟缁�
- * @param address 璧峰鍦板潃
- * @param length 鏁扮粍闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<double[]> ReadDouble(String address, short length) {
- OperateResultExOne<byte[]> read = Read(address, (short) (length * WordLength * 4));
- if (!read.IsSuccess) {
- OperateResultExOne<double[]> result = new OperateResultExOne<double[]>();
- result.CopyErrorFromOther(read);
- return result;
- }
- return OperateResultExOne.CreateSuccessResult(super.getByteTransform().TransDouble(read.Content, 0, length));
- }
-
-
-
- /**
- * 璇诲彇璁惧鐨勫瓧绗︿覆鏁版嵁锛岀紪鐮佷负ASCII
- * @param address 璧峰鍦板潃
- * @param length 鏁版嵁闀垮害
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<String> ReadString(String address, short length) {
- return GetStringResultFromBytes(Read(address, length));
- }
-
-
-
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆short鏁扮粍锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, short[] values) {
- return Write(address, super.getByteTransform().TransByte(values));
- }
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆short鏁版嵁锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, short value) {
- return Write(address, new short[]{value});
- }
-
-
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆int鏁扮粍锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- /// <returns>杩斿洖鍐欏叆缁撴灉</returns>
- public OperateResult Write(String address, int[] values) {
- return Write(address, super.getByteTransform().TransByte(values));
- }
-
- /**
- * 鍚戣澶囦腑鍐欏叆int鏁版嵁锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, int value) {
- return Write(address, new int[]{value});
- }
-
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆float鏁扮粍锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, float[] values) {
- return Write(address, super.getByteTransform().TransByte(values));
- }
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆float鏁版嵁锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, float value) {
- return Write(address, new float[]{value});
- }
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆long鏁扮粍锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, long[] values) {
- return Write(address, getByteTransform().TransByte(values));
- }
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆long鏁版嵁锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, long value) {
- return Write(address, new long[]{value});
- }
-
-
-
-
-
- /**
- * 璁惧涓啓鍏ouble鏁扮粍锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, double[] values) {
- return Write(address, getByteTransform().TransByte(values));
- }
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆double鏁版嵁锛岃繑鍥炴槸鍚﹀啓鍏ユ垚鍔�
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, double value) {
- return Write(address, new double[]{value});
- }
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆瀛楃涓诧紝缂栫爜鏍煎紡涓篈SCII
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖璇诲彇缁撴灉
- */
- public OperateResult Write(String address, String value) {
- byte[] temp = getByteTransform().TransByte(value, "US-ASCII");
- if (WordLength == 1) temp = SoftBasic.ArrayExpandToLengthEven(temp);
- return Write(address, temp);
- }
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆瀛楃涓诧紝缂栫爜鏍煎紡涓篈SCII
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @param length 鍐欏叆鐨勫瓧绗︿覆鐨勯暱搴�
- * @return 杩斿洖璇诲彇缁撴灉
- */
- public OperateResult Write(String address, String value, int length) {
- byte[] temp = getByteTransform().TransByte(value, "US-ASCII");
- temp = SoftBasic.ArrayExpandToLength(temp, length);
- if (WordLength == 1) temp = SoftBasic.ArrayExpandToLengthEven(temp);
- return Write(address, temp);
- }
-
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆瀛楃涓诧紝缂栫爜鏍煎紡涓篣nicode
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁
- * @return 鍐欏叆缁撴灉
- */
- public OperateResult WriteUnicodeString(String address, String value) {
- byte[] temp = Utilities.string2Byte(value);
- return Write(address, temp);
- }
-
-
- /**
- * 鍚戣澶囦腑鍐欏叆瀛楃涓诧紝瓒呭嚭鎴柇锛屼笉澶熻ˉ0锛岀紪鐮佹牸寮忎负Unicode
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁
- * @param length 鎸囧畾鐨勫瓧绗︿覆闀垮害锛屽繀椤诲ぇ浜�0
- * @return 鍐欏叆缁撴灉
- */
- public OperateResult WriteUnicodeString(String address, String value, int length) {
- byte[] temp = Utilities.string2Byte(value);
- temp = SoftBasic.ArrayExpandToLength(temp, length * 2);
- return Write(address, temp);
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓叉暟鎹�
- */
- @Override
- public String toString() {
- return "NetworkDeviceBase<TNetMessage, TTransform>";
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDoubleBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDoubleBase.java
deleted file mode 100644
index bd495c5..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDoubleBase.java
+++ /dev/null
@@ -1,621 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.NetworkBase;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.IMessage.INetMessage;
-import com.zy.common.HslCommunication.Core.Net.StateOne.AlienSession;
-import com.zy.common.HslCommunication.Core.Transfer.ByteTransformHelper;
-import com.zy.common.HslCommunication.Core.Transfer.IByteTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-
-import java.lang.reflect.ParameterizedType;
-import java.net.Socket;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 鍙屾ā寮忕殑瀹㈡埛绔熀绫伙紝
- * @param <TNetMessage> 娑堟伅绫荤殑绫诲瀷
- * @param <TTransform> 杞崲绫荤殑绫诲瀷
- */
-public class NetworkDoubleBase<TNetMessage extends INetMessage ,TTransform extends IByteTransform> extends NetworkBase
-{
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犲嚱鏁�
- */
- public NetworkDoubleBase( )
- {
- queueLock = new ReentrantLock(); // 瀹炰緥鍖栨暟鎹闂攣
- byteTransform = getInstanceOfTTransform(); // 瀹炰緥鍖栨暟鎹浆鎹㈣鍒�
- connectionId = SoftBasic.GetUniqueStringByGuidAndRandom( );
- }
-
-
-
- private TTransform byteTransform; // 鏁版嵁鍙樻崲鐨勬帴鍙�
- private String ipAddress = "127.0.0.1"; // 杩炴帴鐨処P鍦板潃
- private int port = 10000; // 绔彛鍙�
- private int connectTimeOut = 10000; // 杩炴帴瓒呮椂鏃堕棿璁剧疆
- private int receiveTimeOut = 10000; // 鏁版嵁鎺ユ敹鐨勮秴鏃舵椂闂�
- private boolean isPersistentConn = false; // 鏄惁澶勪簬闀胯繛鎺ョ殑鐘舵��
- private Lock queueLock = null; // 鏁版嵁璁块棶鐨勫悓姝ラ攣
- private boolean IsSocketError = false; // 鎸囩ず闀胯繛鎺ョ殑濂楁帴瀛楁槸鍚﹀浜庨敊璇殑鐘舵��
- private boolean isUseSpecifiedSocket = false; // 鎸囩ず鏄惁浣跨敤鎸囧畾鐨勭綉缁滃鎺ュ瓧璁块棶鏁版嵁
- private String connectionId = ""; // 褰撳墠杩炴帴
-
-
-
- private TTransform getInstanceOfTTransform( )
- {
- ParameterizedType superClass = (ParameterizedType) getClass().getGenericSuperclass();
- Class<TTransform> type = (Class<TTransform>) superClass.getActualTypeArguments()[1];
- try
- {
- return type.newInstance();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
- private TNetMessage getInstanceOfTNetMessage( )
- {
- ParameterizedType superClass = (ParameterizedType) getClass().getGenericSuperclass();
- Class<TNetMessage> type = (Class<TNetMessage>) superClass.getActualTypeArguments()[0];
- try
- {
- return type.newInstance();
- }
- catch (Exception e)
- {
- // Oops, no default constructor
- throw new RuntimeException(e);
- }
- }
-
-
-
-
- /**
- * 鑾峰彇鏁版嵁鍙樻崲鏈哄埗
- * @return
- */
- public TTransform getByteTransform( ){
- return byteTransform;
- }
-
- /**
- * 璁剧疆鏁版嵁鍙樻崲鏈哄埗
- * @param transform 鏁版嵁鍙樻崲
- */
- public void setByteTransform(TTransform transform)
- {
- byteTransform = transform;
- }
-
- /**
- * 鑾峰彇杩炴帴鐨勮秴鏃舵椂闂�
- */
- public int getConnectTimeOut( ){
- return connectTimeOut;
- }
-
- /**
- * 璁剧疆杩炴帴鐨勮秴鏃舵椂闂�
- * @param connectTimeOut 瓒呮椂鏃堕棿锛屽崟浣嶆槸绉�
- */
- public void setConnectTimeOut(int connectTimeOut) {
- this.connectTimeOut = connectTimeOut;
- }
-
-
- /**
- * 鑾峰彇鎺ユ敹鏈嶅姟鍣ㄥ弽棣堢殑鏃堕棿锛屽鏋滀负璐熸暟锛屽垯涓嶆帴鏀跺弽棣�
- * @return
- */
- public int getReceiveTimeOut( ){
- return receiveTimeOut;
- }
-
- /**
- * 璁剧疆鎺ユ敹鏈嶅姟鍣ㄥ弽棣堢殑鏃堕棿锛屽鏋滀负璐熸暟锛屽垯涓嶆帴鏀跺弽棣�
- * @param receiveTimeOut
- */
- public void setReceiveTimeOut(int receiveTimeOut){
- this.receiveTimeOut = receiveTimeOut;
- }
-
-
- /**
- * 鑾峰彇鏈嶅姟鍣ㄧ殑IP鍦板潃
- * @return Ip鍦板潃淇℃伅
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
-
- /**
- * 璁剧疆鏈嶅姟鍣ㄧ殑IP鍦板潃
- * @param ipAddress IP鍦板潃
- */
- public void setIpAddress(String ipAddress) {
- if(!ipAddress.isEmpty()){
- this.ipAddress = ipAddress;
- }
- }
-
-
- /**
- * 鑾峰彇鏈嶅姟鍣ㄧ殑绔彛
- * @return 绔彛
- */
- public int getPort() {
- return port;
- }
-
-
- /**
- * 璁剧疆鏈嶅姟鍣ㄧ殑绔彛鍙�
- * @param port 绔彛鍙�
- */
- public void setPort(int port) {
- this.port = port;
- }
-
- /**
- * 褰撳墠杩炴帴鐨勫敮涓�ID鍙凤紝榛樿涓洪暱搴�20鐨刧uid鐮佸姞闅忔満鏁扮粍鎴愶紝涔熷彲浠ヨ嚜宸辨寚瀹�
- * @return
- */
- public String getConnectionId() {
- return connectionId;
- }
-
- /**
- * 璁剧疆褰撳墠鐨勮繛鎺D
- * @param connectionId
- */
- public void setConnectionId(String connectionId) {
- this.connectionId = connectionId;
- }
-
-
-
- /**
- * 褰撳墠鐨勫紓褰㈣繛鎺ュ璞★紝濡傛灉璁剧疆浜嗗紓鎬ц繛鎺ョ殑璇�
- */
- public AlienSession AlienSession = null;
-
-
-
- /**
- * 鍦ㄨ鍙栨暟鎹箣鍓嶅彲浠ヨ皟鐢ㄦ湰鏂规硶灏嗗鎴风璁剧疆涓洪暱杩炴帴妯″紡锛岀浉褰撲簬璺宠繃浜咰onnectServer鐨勭粨鏋滈獙璇侊紝瀵瑰紓褰㈠鎴风鏃犳晥
- */
- public void SetPersistentConnection( )
- {
- isPersistentConn = true;
- }
-
-
- /**
- * 鍒囨崲鐭繛鎺ユā寮忓埌闀胯繛鎺ユā寮忥紝鍚庨潰鐨勬瘡娆¤姹傞兘鍏变韩涓�涓�氶亾
- * @return 杩斿洖杩炴帴缁撴灉锛屽鏋滃け璐ョ殑璇濓紙涔熷嵆IsSuccess涓篎alse锛夛紝鍖呭惈澶辫触淇℃伅
- */
- public OperateResult ConnectServer( )
- {
- isPersistentConn = true;
- OperateResult result = new OperateResult( );
-
- // 閲嶆柊杩炴帴涔嬪墠锛屽厛灏嗘棫鐨勬暟鎹繘琛屾竻绌�
- CloseSocket(CoreSocket);
-
- OperateResultExOne<Socket> rSocket = CreateSocketAndInitialication( );
-
- if (!rSocket.IsSuccess)
- {
- IsSocketError = true; // 鍒涘缓澶辫触
- rSocket.Content = null;
- result.Message = rSocket.Message;
- }
- else
- {
- CoreSocket = rSocket.Content; // 鍒涘缓鎴愬姛
- result.IsSuccess = true;
- if(LogNet != null) LogNet.WriteDebug( toString( ), StringResources.Language.NetEngineStart() );
- }
-
- return result;
- }
-
-
-
- /**
- * 浣跨敤鎸囧畾鐨勫鎺ュ瓧鍒涘缓寮傚舰瀹㈡埛绔�
- * @param session 浼氳瘽
- * @return 閫氬父閮戒负鎴愬姛
- */
- public OperateResult ConnectServer( AlienSession session )
- {
- isPersistentConn = true;
- isUseSpecifiedSocket = true;
-
-
- if (session != null)
- {
- if(AlienSession != null ) CloseSocket(AlienSession.getSocket());
-
- if (connectionId.isEmpty())
- {
- connectionId = session.getDTU();
- }
-
- if (connectionId == session.getDTU())
- {
- CoreSocket = session.getSocket();
- IsSocketError = false;
- AlienSession = session;
- return InitializationOnConnect( session.getSocket() );
- }
- else
- {
- IsSocketError = true;
- return new OperateResult( );
- }
- }
- else
- {
- IsSocketError = true;
- return new OperateResult( );
- }
- }
-
-
-
- /**
- * 鍦ㄩ暱杩炴帴妯″紡涓嬶紝鏂紑鏈嶅姟鍣ㄧ殑杩炴帴锛屽苟鍒囨崲鍒扮煭杩炴帴妯″紡
- * @return 鍏抽棴杩炴帴锛屼笉闇�瑕佹煡鐪婭sSuccess灞炴�ф煡鐪�
- */
- public OperateResult ConnectClose( )
- {
- OperateResult result = new OperateResult( );
- isPersistentConn = false;
-
- queueLock.lock();
-
- // 棰濆鎿嶄綔
- result = ExtraOnDisconnect( CoreSocket );
- // 鍏抽棴淇℃伅
- if(CoreSocket != null ) CloseSocket(CoreSocket);
- CoreSocket = null;
-
- queueLock.unlock();
-
- if(LogNet != null ) LogNet.WriteDebug( toString( ), StringResources.Language.NetEngineClose() );
- return result;
- }
-
-
- /**
- * 鍦ㄨ繛鎺ョ殑鏃跺�欒繘琛屽垵濮嬪寲
- * @param socket 缃戠粶濂楁帴瀛�
- * @return 缁撴灉绫诲璞�
- */
- protected OperateResult InitializationOnConnect( Socket socket ) {
- return OperateResult.CreateSuccessResult();
- }
-
-
- /**
- * 鍦ㄥ皢瑕佸拰鏈嶅姟鍣ㄨ繘琛屾柇寮�鐨勬儏鍐典笅棰濆鐨勬搷浣�
- * @param socket 缃戠粶濂楁帴瀛�
- * @return 缁撴灉绫诲璞�
- */
- protected OperateResult ExtraOnDisconnect( Socket socket ) {
- return OperateResult.CreateSuccessResult();
- }
-
-
- /***************************************************************************************
- *
- * 涓昏鐨勬暟鎹氦浜掑垎涓�4姝�
- * 1. 杩炴帴鏈嶅姟鍣紝鎴栨槸鑾峰彇鍒版棫鐨勪娇鐢ㄧ殑缃戠粶淇℃伅
- * 2. 鍙戦�佹暟鎹俊鎭�
- * 3. 鎺ユ敹鍙嶉鐨勬暟鎹俊鎭�
- * 4. 鍏抽棴缃戠粶杩炴帴锛屽鏋滄槸鐭繛鎺ョ殑璇�
- *
- **************************************************************************************/
-
-
- /**
- * 鑾峰彇鏈鎿嶄綔鐨勫彲鐢ㄧ殑缃戠粶濂楁帴瀛�
- * @return 鏄惁鎴愬姛锛屽鏋滄垚鍔燂紝浣跨敤杩欎釜濂楁帴瀛�
- */
- private OperateResultExOne<Socket> GetAvailableSocket( ) {
- // 鏄惁澶勪簬闀胯繛鎺ョ殑鐘舵��
- if (isPersistentConn) {
- // 濡傛灉鏄紓褰㈡ā寮�
- if (isUseSpecifiedSocket) {
- // 鎸囩ず闀胯繛鎺ョ殑濂楁帴瀛楁槸鍚﹀浜庨敊璇殑鐘舵��
- if(IsSocketError) {
- OperateResultExOne<Socket> rSocket = new OperateResultExOne<>();
- rSocket.Message = "杩炴帴涓嶅彲鐢�";
- return rSocket;
- } else {
- return OperateResultExOne.CreateSuccessResult( CoreSocket );
- }
- } else {
- // 闀胯繛鎺ユā寮�
- if (IsSocketError || CoreSocket == null) {
- OperateResult connect = ConnectServer( );
- if (!connect.IsSuccess) {
- IsSocketError = true;
- OperateResultExOne<Socket> rSocket = new OperateResultExOne<>();
- rSocket.Message = connect.Message;
- rSocket.ErrorCode = connect.ErrorCode;
- return rSocket;
- } else {
- IsSocketError = false;
- return OperateResultExOne.CreateSuccessResult( CoreSocket );
- }
- } else {
- return OperateResultExOne.CreateSuccessResult( CoreSocket );
- }
- }
-
- } else {
- // 鐭繛鎺ユā寮�
- return CreateSocketAndInitialication( );
- }
- }
-
-
-
- /**
- * 杩炴帴骞跺垵濮嬪寲缃戠粶濂楁帴瀛�
- * @return 鏈�缁堢殑杩炴帴瀵硅薄
- */
- private OperateResultExOne<Socket> CreateSocketAndInitialication( )
- {
- OperateResultExOne<Socket> result = CreateSocketAndConnect( ipAddress , port , connectTimeOut );
- if (result.IsSuccess)
- {
- // 鍒濆鍖�
- OperateResult initi = InitializationOnConnect( result.Content );
- if (!initi.IsSuccess)
- {
- CloseSocket(result.Content);
- result.IsSuccess = initi.IsSuccess;
- result.CopyErrorFromOther( initi );
- }
- }
- return result;
- }
-
-
- /**
- * 鍦ㄥ叾浠栨寚瀹氱殑濂楁帴瀛椾笂锛屼娇鐢ㄦ姤鏂囨潵閫氳锛屼紶鍏ラ渶瑕佸彂閫佺殑娑堟伅锛岃繑鍥炰竴鏉″畬鏁寸殑鏁版嵁鎸囦护
- * @param socket 鎸囧畾鐨勫鎺ュ瓧
- * @param send 鍙戦�佺殑瀹屾暣鐨勬姤鏂囦俊鎭�
- * @return 鎺ユ敹鐨勫畬鏁寸殑鎶ユ枃淇℃伅
- */
- public OperateResultExOne<byte[]> ReadFromCoreServer( Socket socket, byte[] send )
- {
- OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>( );
-
- OperateResultExTwo<byte[], byte[]> read = ReadFromCoreServerBase( socket, send );
- if (read.IsSuccess)
- {
- result.IsSuccess = read.IsSuccess;
- result.Content = new byte[read.Content1.length + read.Content2.length];
- if (read.Content1.length > 0) System.arraycopy(read.Content1,0,result.Content,0,read.Content1.length);
- if (read.Content2.length > 0) System.arraycopy(read.Content2,0,result.Content,read.Content1.length,read.Content2.length);
- }
- else
- {
- result.CopyErrorFromOther( read );
- }
- return result;
- }
-
-
-
- /**
- * 浣跨敤搴曞眰鐨勬暟鎹姤鏂囨潵閫氳锛屼紶鍏ラ渶瑕佸彂閫佺殑娑堟伅锛岃繑鍥炰竴鏉″畬鏁寸殑鏁版嵁鎸囦护
- * @param send 鍙戦�佺殑瀹屾暣鐨勬姤鏂囦俊鎭�
- * @return 鎺ユ敹鐨勫畬鏁寸殑鎶ユ枃淇℃伅
- */
- public OperateResultExOne<byte[]> ReadFromCoreServer( byte[] send )
- {
- OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>( );
- // string tmp1 = BasicFramework.SoftBasic.ByteToHexString( send, '-' );
-
- queueLock.lock( );
-
- // 鑾峰彇鏈夌敤鐨勭綉缁滈�氶亾锛屽鏋滄病鏈夛紝灏卞缓绔嬫柊鐨勮繛鎺�
- OperateResultExOne<Socket> resultSocket = GetAvailableSocket( );
- if (!resultSocket.IsSuccess)
- {
- IsSocketError = true;
- if (AlienSession != null) AlienSession.setIsStatusOk( false);
- queueLock.unlock();
- result.CopyErrorFromOther( resultSocket );
- return result;
- }
-
- OperateResultExOne<byte[]> read = ReadFromCoreServer( resultSocket.Content, send );
-
- if (read.IsSuccess)
- {
- IsSocketError = false;
- result.IsSuccess = read.IsSuccess;
- result.Content = read.Content;
- // string tmp2 = BasicFramework.SoftBasic.ByteToHexString( result.Content ) ;
- }
- else
- {
- IsSocketError = true;
- if (AlienSession != null) AlienSession.setIsStatusOk(false);
- result.CopyErrorFromOther( read );
- }
-
- queueLock.unlock();
- if (!isPersistentConn) CloseSocket(resultSocket.Content );
- return result;
- }
-
-
- /**
- * 浣跨敤搴曞眰鐨勬暟鎹姤鏂囨潵閫氳锛屼紶鍏ラ渶瑕佸彂閫佺殑娑堟伅锛岃繑鍥炴渶缁堢殑鏁版嵁缁撴灉锛岃鎷嗗垎鎴愪簡澶村瓙鑺傚拰鍐呭瀛楄妭淇℃伅
- * @param socket 缃戠粶濂楁帴瀛�
- * @param send 鍙戦�佺殑鏁版嵁
- * @return 缁撴灉瀵硅薄
- */
- protected OperateResultExTwo<byte[], byte[]> ReadFromCoreServerBase(Socket socket, byte[] send )
- {
- OperateResultExTwo<byte[], byte[]> result = new OperateResultExTwo<byte[], byte[]>( );
- // LogNet?.WriteDebug( ToString( ), "Command: " + BasicFramework.SoftBasic.ByteToHexString( send ) );
- TNetMessage netMsg = getInstanceOfTNetMessage();
- netMsg.setSendBytes(send);
-
- // 鍙戦�佹暟鎹俊鎭�
- OperateResult resultSend = Send( socket, send );
- if (!resultSend.IsSuccess)
- {
- CloseSocket(socket);
- result.CopyErrorFromOther( resultSend );
- return result;
- }
-
- // 鎺ユ敹瓒呮椂鏃堕棿澶т簬0鏃舵墠鍏佽鎺ユ敹杩滅▼鐨勬暟鎹�
- if (receiveTimeOut >= 0)
- {
- // 鎺ユ敹鏁版嵁淇℃伅
- OperateResultExOne<TNetMessage> resultReceive = ReceiveMessage(socket, receiveTimeOut, netMsg);
- if (!resultReceive.IsSuccess)
- {
- CloseSocket(socket );
- result.CopyErrorFromOther( resultReceive );
- // result.Message = "Receive data timeout: " + receiveTimeOut;
- return result;
- }
-
- // 澶嶅埗缁撴灉
- result.Content1 = resultReceive.Content.getHeadBytes();
- result.Content2 = resultReceive.Content.getContentBytes();
- }
-
- result.IsSuccess = true;
- return result;
- }
-
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return
- */
- @Override
- public String toString( ) {
- return "NetworkDoubleBase<TNetMessage>";
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Boolean> GetBoolResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetBoolResultFromBytes( result, byteTransform);
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Byte> GetByteResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetByteResultFromBytes( result, byteTransform );
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Short> GetInt16ResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetInt16ResultFromBytes( result, byteTransform );
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Integer> GetInt32ResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetInt32ResultFromBytes( result, byteTransform );
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Long> GetInt64ResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetInt64ResultFromBytes( result, byteTransform );
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Float> GetSingleResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetSingleResultFromBytes( result, byteTransform );
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<Double> GetDoubleResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetDoubleResultFromBytes( result, byteTransform );
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @return 杞寲鍚庣殑绫诲瀷
- */
- protected OperateResultExOne<String> GetStringResultFromBytes( OperateResultExOne<byte[]> result )
- {
- return ByteTransformHelper.GetStringResultFromBytes( result, byteTransform );
- }
-
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkXBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkXBase.java
deleted file mode 100644
index a89b5e1..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkXBase.java
+++ /dev/null
@@ -1,735 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.NetworkBase;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.Net.HslProtocol;
-import com.zy.common.HslCommunication.Core.Net.StateOne.AppSession;
-import com.zy.common.HslCommunication.Core.Types.*;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Date;
-
-/**
- * 瀹㈡埛绔湇鍔″櫒鐨勫叡浜熀绫�
- */
-public class NetworkXBase extends NetworkBase
-{
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public NetworkXBase()
- {
- }
-
- /**
- * 鍙戦�佹暟鎹殑鏂规硶
- * @param session 閫氫俊鐢ㄧ殑鏍稿績瀵硅薄
- * @param content 瀹屾暣鐨勫瓧鑺備俊鎭�
- */
- void SendBytesAsync(AppSession session, byte[] content )
- {
- if (content == null) return;
- try
- {
- // 杩涘叆鍙戦�佹暟鎹殑閿侊紝鐒跺悗寮�鍚紓姝ョ殑鏁版嵁鍙戦��
- session.getHybirdLockSend().lock();
- OutputStream outputStream = session.getWorkSocket().getOutputStream();
- outputStream.write(content);
- }
- catch (Exception ex)
- {
- if (!ex.getMessage().contains( StringResources.Language.SocketRemoteCloseException() ))
- {
- if(LogNet!=null) LogNet.WriteException( toString( ), StringResources.Language.SocketSendException(), ex );
- }
- }
- finally {
- session.getHybirdLockSend().unlock();
- }
- }
-
-
- private Thread thread; // 鍚庡彴绾跨▼
-
- /**
- * 寮�濮嬫帴鍙楁暟鎹�
- * @param session 浼氳瘽淇℃伅
- */
- protected void BeginReceiveBackground(AppSession session){
- thread = new Thread(){
- @Override
- public void run(){
- while (true){
- OperateResultExOne<byte[]> readHeadBytes = Receive(session.getWorkSocket(),HslProtocol.HeadByteLength);
- if(!readHeadBytes.IsSuccess){
- SocketReceiveException( session );
- return;
- }
-
- int length = Utilities.getInt(readHeadBytes.Content,28);
- OperateResultExOne<byte[]> readContent = Receive(session.getWorkSocket(),length);
- if(!readContent.IsSuccess){
- SocketReceiveException( session );
- return;
- }
-
- if (CheckRemoteToken( readHeadBytes.Content ))
- {
- byte[] head = readHeadBytes.Content;
- byte[] content = HslProtocol.CommandAnalysis(head,readContent.Content);
- int protocol = Utilities.getInt( head, 0 );
- int customer = Utilities.getInt( head, 4 );
-
- DataProcessingCenter(session,protocol,customer,content);
- }
- else {
- if(LogNet!=null) LogNet.WriteWarn( toString( ), StringResources.Language.TokenCheckFailed() );
- AppSessionRemoteClose( session );
- }
- }
- }
- };
- thread.start();
- }
-
- /**
- * 鏁版嵁澶勭悊涓績锛屽簲璇ョ户鎵块噸鍐�
- * @param session 杩炴帴鐘舵��
- * @param protocol 鍗忚澶�
- * @param customer 鐢ㄦ埛鑷畾涔�
- * @param content 鏁版嵁鍐呭
- */
- protected void DataProcessingCenter( AppSession session, int protocol, int customer, byte[] content ) {
-
- }
-
- /**
- * 妫�鏌ュ綋鍓嶇殑澶村瓙鑺備俊鎭殑浠ょ墝鏄惁鏄纭殑
- * @param headBytes 澶村瓙鑺傛暟鎹�
- * @return 浠ょ墝鏄獙璇佹垚鍔�
- */
- protected boolean CheckRemoteToken( byte[] headBytes )
- {
- return SoftBasic.IsTwoBytesEquel( headBytes,12, Utilities.UUID2Byte(Token),0,16 );
- }
-
-
- /**
- * 鎺ユ敹鍑洪敊鐨勬椂鍊欒繘琛屽鐞�
- * @param session 浼氳瘽鍐呭
- */
- protected void SocketReceiveException( AppSession session ) {
-
- }
-
-
- /**
- * 褰撹繙绔殑瀹㈡埛绔叧闂繛鎺ユ椂瑙﹀彂
- * @param session 浼氳瘽鍐呭
- */
- protected void AppSessionRemoteClose( AppSession session ) {
-
- }
-
-
-
- /**
- * [鑷牎楠宂 鍙戦�佸瓧鑺傛暟鎹苟纭瀵规柟鎺ユ敹瀹屾垚鏁版嵁锛屽鏋滅粨鏋滃紓甯革紝鍒欑粨鏉熼�氳
- * @param socket 缃戠粶濂楁帴瀛�
- * @param headcode 澶存寚浠�
- * @param customer 鐢ㄦ埛鎸囦护
- * @param send 鍙戦�佺殑鏁版嵁
- * @return 鏄惁鍙戦�佹垚鍔�
- */
- protected OperateResult SendBaseAndCheckReceive(Socket socket, int headcode, int customer, byte[] send )
- {
- // 鏁版嵁澶勭悊
- send = HslProtocol.CommandBytes( headcode, customer, Token, send );
-
- OperateResult sendResult = Send( socket, send );
- if(!sendResult.IsSuccess) return sendResult;
-
- // 妫�鏌ュ鏂规帴鏀跺畬鎴�
- OperateResultExOne<Long> checkResult = ReceiveLong( socket );
- if(!checkResult.IsSuccess) return checkResult;
-
- // 妫�鏌ラ暱搴︽帴鏀�
- if (checkResult.Content != send.length)
- {
- CloseSocket(socket);
- return new OperateResult(StringResources.Language.CommandLengthCheckFailed());
- }
-
- return checkResult;
- }
-
-
- /**
- * [鑷牎楠宂 鍙戦�佸瓧鑺傛暟鎹苟纭瀵规柟鎺ユ敹瀹屾垚鏁版嵁锛屽鏋滅粨鏋滃紓甯革紝鍒欑粨鏉熼�氳
- * @param socket 缃戠粶濂楁帴瀛�
- * @param customer 鐢ㄦ埛鎸囦护
- * @param send 鍙戦�佺殑鏁版嵁
- * @return 鏄惁鍙戦�佹垚鍔�
- */
- protected OperateResult SendBytesAndCheckReceive( Socket socket, int customer, byte[] send )
- {
- return SendBaseAndCheckReceive( socket, HslProtocol.ProtocolUserBytes, customer, send );
- }
-
-
- /**
- * [鑷牎楠宂 鐩存帴鍙戦�佸瓧绗︿覆鏁版嵁骞剁‘璁ゅ鏂规帴鏀跺畬鎴愭暟鎹紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- * @param socket 缃戠粶濂楁帴瀛�
- * @param customer 鐢ㄦ埛鎸囦护
- * @param send 鍙戦�佺殑鏁版嵁
- * @return 鏄惁鍙戦�佹垚鍔�
- */
- protected OperateResult SendStringAndCheckReceive( Socket socket, int customer, String send )
- {
- byte[] data =(send == null || send.isEmpty() ) ? null : Utilities.string2Byte( send );
-
- return SendBaseAndCheckReceive( socket, HslProtocol.ProtocolUserString, customer, data );
- }
-
-
-
- /// <summary>
- /// [鑷牎楠宂 灏嗘枃浠舵暟鎹彂閫佽嚦濂楁帴瀛楋紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- /// </summary>
- /// <param name="socket">缃戠粶濂楁帴瀛�</param>
- /// <param name="filename">瀹屾暣鐨勬枃浠惰矾寰�</param>
- /// <param name="filelength">鏂囦欢鐨勯暱搴�</param>
- /// <param name="report">杩涘害鎶ュ憡鍣�</param>
- /// <returns>鏄惁鍙戦�佹垚鍔�</returns>
-// protected OperateResult SendFileStreamToSocket( Socket socket, String filename, long filelength, BiConsumer<Long, Long> report )
-// {
-// try
-// {
-// OperateResult result = null;
-// FileInputStream
-// using (FileStream fs = new FileStream( filename, FileMode.Open, FileAccess.Read ))
-// {
-// result = SendStream( socket, fs, filelength, report, true );
-// }
-// return result;
-// }
-// catch (Exception ex)
-// {
-// socket?.Close( );
-// LogNet?.WriteException( ToString( ), ex );
-// return new OperateResult( )
-// {
-// Message = ex.Message
-// };
-// }
-// }
-
-
- /// <summary>
- /// [鑷牎楠宂 灏嗘枃浠舵暟鎹彂閫佽嚦濂楁帴瀛楋紝鍏蜂綋鍙戦�佺粏鑺傚皢鍦ㄧ户鎵跨被涓疄鐜帮紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- /// </summary>
- /// <param name="socket">濂楁帴瀛�</param>
- /// <param name="filename">鏂囦欢鍚嶇О锛屾枃浠跺繀椤诲瓨鍦�</param>
- /// <param name="servername">杩滅▼绔殑鏂囦欢鍚嶇О</param>
- /// <param name="filetag">鏂囦欢鐨勯澶栨爣绛�</param>
- /// <param name="fileupload">鏂囦欢鐨勪笂浼犱汉</param>
- /// <param name="sendReport">鍙戦�佽繘搴︽姤鍛�</param>
- /// <returns>鏄惁鍙戦�佹垚鍔�</returns>
-// protected OperateResult SendFileAndCheckReceive(
-// Socket socket,
-// String filename,
-// String servername,
-// String filetag,
-// String fileupload,
-// BiConsumer<Long, Long> sendReport
-// )
-// {
-// // 鍙戦�佹枃浠跺悕锛屽ぇ灏忥紝鏍囩
-// File file = new File(filename);
-//
-// if (!file.exists())
-// {
-// // 濡傛灉鏂囦欢涓嶅瓨鍦�
-// OperateResult stringResult = SendStringAndCheckReceive( socket, 0, "" );
-// if (!stringResult.IsSuccess)
-// {
-// return stringResult;
-// }
-// else
-// {
-// CloseSocket(socket);
-// OperateResult result = new OperateResult();
-// result.Message = StringResources.FileNotExist;
-// return result;
-// }
-// }
-//
-// // 鏂囦欢瀛樺湪鐨勬儏鍐�
-// Newtonsoft.Json.Linq.JObject json = new Newtonsoft.Json.Linq.JObject
-// {
-// { "FileName", new Newtonsoft.Json.Linq.JValue(servername) },
-// { "FileSize", new Newtonsoft.Json.Linq.JValue(file.length()) },
-// { "FileTag", new Newtonsoft.Json.Linq.JValue(filetag) },
-// { "FileUpload", new Newtonsoft.Json.Linq.JValue(fileupload) }
-// };
-//
-// // 鍏堝彂閫佹枃浠剁殑淇℃伅鍒板鏂�
-// OperateResult sendResult = SendStringAndCheckReceive( socket, 1, json.ToString( ) );
-// if (!sendResult.IsSuccess)
-// {
-// return sendResult;
-// }
-//
-// // 鏈�鍚庡彂閫�
-// return SendFileStreamToSocket( socket, filename, file.length(), sendReport );
-// }
-
-
-
- /// <summary>
- /// [鑷牎楠宂 灏嗘祦鏁版嵁鍙戦�佽嚦濂楁帴瀛楋紝鍏蜂綋鍙戦�佺粏鑺傚皢鍦ㄧ户鎵跨被涓疄鐜帮紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- /// </summary>
- /// <param name="socket">濂楁帴瀛�</param>
- /// <param name="stream">鏂囦欢鍚嶇О锛屾枃浠跺繀椤诲瓨鍦�</param>
- /// <param name="servername">杩滅▼绔殑鏂囦欢鍚嶇О</param>
- /// <param name="filetag">鏂囦欢鐨勯澶栨爣绛�</param>
- /// <param name="fileupload">鏂囦欢鐨勪笂浼犱汉</param>
- /// <param name="sendReport">鍙戦�佽繘搴︽姤鍛�</param>
- /// <returns></returns>
-// protected OperateResult SendFileAndCheckReceive(
-// Socket socket,
-// Stream stream,
-// String servername,
-// String filetag,
-// String fileupload,
-// BiConsumer<Long, Long> sendReport
-// )
-// {
-// // 鏂囦欢瀛樺湪鐨勬儏鍐�
-// Newtonsoft.Json.Linq.JObject json = new Newtonsoft.Json.Linq.JObject
-// {
-// { "FileName", new Newtonsoft.Json.Linq.JValue(servername) },
-// { "FileSize", new Newtonsoft.Json.Linq.JValue(stream.Length) },
-// { "FileTag", new Newtonsoft.Json.Linq.JValue(filetag) },
-// { "FileUpload", new Newtonsoft.Json.Linq.JValue(fileupload) }
-// };
-//
-//
-// // 鍙戦�佹枃浠朵俊鎭�
-// OperateResult fileResult = SendStringAndCheckReceive( socket, 1, json.ToString( ) );
-// if (!fileResult.IsSuccess) return fileResult;
-//
-//
-// return SendStream( socket, stream, stream.count(), sendReport, true );
-// }
-
-
-
-
-
- /**
- * [鑷牎楠宂 鎺ユ敹涓�鏉″畬鏁寸殑鍚屾鏁版嵁锛屽寘鍚ご瀛愯妭鍜屽唴瀹瑰瓧鑺傦紝鍩虹鐨勬暟鎹紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- * @param socket 濂楁帴瀛�
- * @param timeout 瓒呮椂鏃堕棿璁剧疆锛屽鏋滀负璐熸暟锛屽垯涓嶆鏌ヨ秴鏃�
- * @return 鎺ユ敹鐨勭粨鏋滄暟鎹�
- */
- protected OperateResultExTwo<byte[], byte[]> ReceiveAndCheckBytes( Socket socket, int timeout ) {
- // 30绉掕秴鏃舵帴鏀堕獙璇�
- HslTimeOut hslTimeOut = new HslTimeOut();
- hslTimeOut.DelayTime = timeout;
- hslTimeOut.IsSuccessful = false;
- hslTimeOut.StartTime = new Date();
- hslTimeOut.WorkSocket = socket;
-
-
- //if (timeout > 0) ThreadPool.QueueUserWorkItem( new WaitCallback( ThreadPoolCheckTimeOut ), hslTimeOut );
-
- // 鎺ユ敹澶存寚浠�
- OperateResultExOne<byte[]> headResult = Receive(socket, HslProtocol.HeadByteLength, timeout);
- if (!headResult.IsSuccess) {
- hslTimeOut.IsSuccessful = true;
- return OperateResultExTwo.<byte[],byte[]>CreateFailedResult(headResult);
- }
- hslTimeOut.IsSuccessful = true;
-
- // 妫�鏌ヤ护鐗�
- if (!CheckRemoteToken(headResult.Content)) {
- CloseSocket(socket);
- return new OperateResultExTwo<>(StringResources.Language.TokenCheckFailed());
- }
-
- int contentLength = Utilities.getInt(headResult.Content, HslProtocol.HeadByteLength - 4);
- // 鎺ユ敹鍐呭
- OperateResultExOne<byte[]> contentResult = Receive(socket, contentLength);
- if (!contentResult.IsSuccess) return OperateResultExTwo.CreateFailedResult(contentResult);
-
- // 杩斿洖鎴愬姛淇℃伅
- OperateResult checkResult = SendLong(socket, HslProtocol.HeadByteLength + contentLength);
- if (!checkResult.IsSuccess) return OperateResultExTwo.CreateFailedResult(checkResult);
-
- byte[] head = headResult.Content;
- byte[] content = contentResult.Content;
- content = HslProtocol.CommandAnalysis(head, content);
- return OperateResultExTwo.CreateSuccessResult(head, content);
- }
-
-
- /**
- * [鑷牎楠宂 浠庣綉缁滀腑鎺ユ敹涓�涓瓧绗︿覆鏁版嵁锛屽鏋滅粨鏋滃紓甯革紝鍒欑粨鏉熼�氳
- * @param socket 濂楁帴瀛�
- * @return 鎺ユ敹鐨勭粨鏋滄暟鎹�
- */
- protected OperateResultExTwo<Integer, String> ReceiveStringContentFromSocket( Socket socket ) {
- OperateResultExTwo<byte[], byte[]> receive = ReceiveAndCheckBytes(socket, 10000);
- if (!receive.IsSuccess) return OperateResultExTwo.CreateFailedResult(receive);
-
- // 妫�鏌ユ槸鍚︽槸瀛楃涓蹭俊鎭�
- if (Utilities.getInt(receive.Content1, 0) != HslProtocol.ProtocolUserString) {
- if (LogNet != null) LogNet.WriteError(toString(), StringResources.Language.CommandHeadCodeCheckFailed());
- CloseSocket(socket);
- return new OperateResultExTwo<>(StringResources.Language.CommandHeadCodeCheckFailed());
- }
-
- if (receive.Content2 == null) receive.Content2 = new byte[0];
- // 鍒嗘瀽鏁版嵁
- return OperateResultExTwo.CreateSuccessResult(Utilities.getInt(receive.Content1, 4), Utilities.byte2String(receive.Content2));
- }
-
-
-
-
- /**
- * [鑷牎楠宂 浠庣綉缁滀腑鎺ユ敹涓�涓插瓧鑺傛暟鎹紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- * @param socket 濂楁帴瀛�
- * @return 缁撴灉鏁版嵁瀵硅薄
- */
- protected OperateResultExTwo<Integer, byte[]> ReceiveBytesContentFromSocket( Socket socket )
- {
- OperateResultExTwo<byte[], byte[]> receive = ReceiveAndCheckBytes( socket, 10000 );
- if (!receive.IsSuccess) return OperateResultExTwo.CreateFailedResult(receive);
-
- // 妫�鏌ユ槸鍚︽槸瀛楄妭淇℃伅
- if (Utilities.getInt( receive.Content1, 0 ) != HslProtocol.ProtocolUserBytes)
- {
- if(LogNet!=null) LogNet.WriteError( toString( ), StringResources.Language.CommandHeadCodeCheckFailed() );
- CloseSocket(socket);
-
- return new OperateResultExTwo<>(StringResources.Language.CommandHeadCodeCheckFailed());
- }
-
- // 鍒嗘瀽鏁版嵁
- return OperateResultExTwo.CreateSuccessResult( Utilities.getInt( receive.Content1, 4 ), receive.Content2 );
- }
-
-
- /// <summary>
- /// [鑷牎楠宂 浠庡鎺ュ瓧涓帴鏀舵枃浠跺ご淇℃伅
- /// </summary>
- /// <param name="socket"></param>
- /// <returns></returns>
-// protected OperateResult<FileBaseInfo> ReceiveFileHeadFromSocket( Socket socket )
-// {
-// // 鍏堟帴鏀舵枃浠跺ご淇℃伅
-// OperateResult<int, string> receiveString = ReceiveStringContentFromSocket( socket );
-// if (!receiveString.IsSuccess) return OperateResult.CreateFailedResult<FileBaseInfo>( receiveString );
-//
-// // 鍒ゆ柇鏂囦欢鏄惁瀛樺湪
-// if (receiveString.Content1 == 0)
-// {
-// socket?.Close( );
-// LogNet?.WriteWarn( ToString( ), "瀵规柟鏂囦欢涓嶅瓨鍦紝鏃犳硶鎺ユ敹锛�" );
-// return new OperateResult<FileBaseInfo>( )
-// {
-// Message = StringResources.FileNotExist
-// };
-// }
-//
-// OperateResult<FileBaseInfo> result = new OperateResult<FileBaseInfo>( );
-// result.Content = new FileBaseInfo( );
-// try
-// {
-// // 鎻愬彇淇℃伅
-// Newtonsoft.Json.Linq.JObject json = Newtonsoft.Json.Linq.JObject.Parse( receiveString.Content2 );
-// result.Content.Name = SoftBasic.GetValueFromJsonObject( json, "FileName", "" );
-// result.Content.Size = SoftBasic.GetValueFromJsonObject( json, "FileSize", 0L );
-// result.Content.Tag = SoftBasic.GetValueFromJsonObject( json, "FileTag", "" );
-// result.Content.Upload = SoftBasic.GetValueFromJsonObject( json, "FileUpload", "" );
-// result.IsSuccess = true;
-// }
-// catch (Exception ex)
-// {
-// socket?.Close( );
-// result.Message = "鎻愬彇淇℃伅澶辫触锛�" + ex.Message;
-// }
-//
-// return result;
-// }
-
- /// <summary>
- /// [鑷牎楠宂 浠庣綉缁滀腑鎺ユ敹涓�涓枃浠讹紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳
- /// </summary>
- /// <param name="socket">缃戠粶濂楁帴瀛�</param>
- /// <param name="savename">鎺ユ敹鏂囦欢鍚庝繚瀛樼殑鏂囦欢鍚�</param>
- /// <param name="receiveReport">鎺ユ敹杩涘害鎶ュ憡</param>
- /// <returns></returns>
-// protected OperateResult<FileBaseInfo> ReceiveFileFromSocket( Socket socket, string savename, Action<long, long> receiveReport )
-// {
-// // 鍏堟帴鏀舵枃浠跺ご淇℃伅
-// OperateResult<FileBaseInfo> fileResult = ReceiveFileHeadFromSocket( socket );
-// if (!fileResult.IsSuccess) return fileResult;
-//
-// try
-// {
-// using (FileStream fs = new FileStream( savename, FileMode.Create, FileAccess.Write ))
-// {
-// WriteStream( socket, fs, fileResult.Content.Size, receiveReport, true );
-// }
-// return fileResult;
-// }
-// catch (Exception ex)
-// {
-// LogNet?.WriteException( ToString( ), ex );
-// socket?.Close( );
-// return new OperateResult<FileBaseInfo>( )
-// {
-// Message = ex.Message
-// };
-// }
-// }
-
-
- /// <summary>
- /// [鑷牎楠宂 浠庣綉缁滀腑鎺ユ敹涓�涓枃浠讹紝鍐欏叆鏁版嵁娴侊紝濡傛灉缁撴灉寮傚父锛屽垯缁撴潫閫氳锛屽弬鏁伴『搴忔枃浠跺悕锛屾枃浠跺ぇ灏忥紝鏂囦欢鏍囪瘑锛屼笂浼犱汉
- /// </summary>
- /// <param name="socket">缃戠粶濂楁帴瀛�</param>
- /// <param name="stream">绛夊緟鍐欏叆鐨勬暟鎹祦</param>
- /// <param name="receiveReport">鎺ユ敹杩涘害鎶ュ憡</param>
- /// <returns></returns>
-// protected OperateResult<FileBaseInfo> ReceiveFileFromSocket( Socket socket, Stream stream, Action<long, long> receiveReport )
-// {
-// // 鍏堟帴鏀舵枃浠跺ご淇℃伅
-// OperateResult<FileBaseInfo> fileResult = ReceiveFileHeadFromSocket( socket );
-// if (!fileResult.IsSuccess) return fileResult;
-//
-// try
-// {
-// WriteStream( socket, stream, fileResult.Content.Size, receiveReport, true );
-// return fileResult;
-// }
-// catch (Exception ex)
-// {
-// LogNet?.WriteException( ToString( ), ex );
-// socket?.Close( );
-// return new OperateResult<FileBaseInfo>( )
-// {
-// Message = ex.Message
-// };
-// }
-// }
-
-
- /**
- * 鍒犻櫎鏂囦欢鐨勬搷浣�
- * @param filename 鏂囦欢鐨勫悕绉�
- * @return 鏄惁鍒犻櫎鎴愬姛
- */
- protected boolean DeleteFileByName( String filename )
- {
- try
- {
- File file = new File(filename);
-
- if (!file.exists()) return true;
- file.delete();
- return true;
- }
- catch (Exception ex)
- {
- if(LogNet!=null) LogNet.WriteException( toString( ), "delete file failed:" + filename, ex );
- return false;
- }
- }
-
-
- /**
- * 棰勫鐞嗘枃浠跺す鐨勫悕绉帮紝闄ゅ幓鏂囦欢澶瑰悕绉版渶鍚庝竴涓�'\'锛屽鏋滄湁鐨勮瘽
- * @param folder 鏂囦欢澶瑰悕绉�
- * @return 缁撴灉鏁版嵁
- */
- protected String PreprocessFolderName( String folder ) {
- if (folder.endsWith("\\")) {
- return folder.substring(0, folder.length() - 1);
- } else {
- return folder;
- }
- }
-
-
-
-
-
-
-
-
-
-
- /**
- * 浠庣綉缁滀腑鎺ユ敹Long鏁版嵁
- * @param socket 濂楁帴瀛椾俊鎭�
- * @return 杩斿洖鐨勭粨鏋�
- */
- private OperateResultExOne<Long> ReceiveLong( Socket socket ) {
- OperateResultExOne<byte[]> read = Receive(socket, 8);
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult(read);
-
- return OperateResultExOne.CreateSuccessResult(Utilities.getLong(read.Content, 0));
- }
-
- /**
- * 灏哃ong鏁版嵁鍙戦�佸埌濂楁帴瀛�
- * @param socket 濂楁帴瀛�
- * @param value 鍊�
- * @return 杩斿洖鐨勭粨鏋�
- */
- private OperateResult SendLong( Socket socket, long value )
- {
- return Send( socket, Utilities.getBytes( value ) );
- }
-
-
-
-
-
- /**
- * 鍙戦�佷竴涓祦鐨勬墍鏈夋暟鎹埌缃戠粶濂楁帴瀛�
- * @param socket 缃戠粶濂楁帴瀛�
- * @param stream 杈撳叆娴�
- * @param receive 鎺ユ敹闀垮害
- * @param report 杩涘害鎶ュ憡
- * @param reportByPercent 鏄惁鎸夌収鐧惧垎姣旀姤鍛婅繘搴�
- * @return 鏄惁鎴愬姛
- */
- protected OperateResult SendStream(Socket socket, InputStream stream, long receive, ActionOperateExTwo<Long, Long> report, boolean reportByPercent )
- {
- byte[] buffer = new byte[102400]; // 100K鐨勬暟鎹紦瀛樻睜
- long SendTotal = 0;
- long percent = 0;
- while (SendTotal < receive)
- {
- // 鍏堜粠娴佷腑鎺ユ敹鏁版嵁
- OperateResultExOne<Integer> read = ReadStream( stream, buffer );
- if (!read.IsSuccess)
- {
- OperateResult result = new OperateResult();
- result.Message = read.Message;
- return result;
- }
- else
- {
- SendTotal += read.Content;
- }
-
- // 鐒跺悗鍐嶅紓姝ュ啓鍒皊ocket涓�
- byte[] newBuffer = new byte[read.Content];
- System.arraycopy( buffer, 0, newBuffer, 0, newBuffer.length );
- OperateResult write = SendBytesAndCheckReceive( socket, read.Content, newBuffer );
- if (!write.IsSuccess)
- {
- OperateResult result = new OperateResult();
- result.Message = write.Message;
- return result;
- }
-
- // 鎶ュ憡杩涘害
- if (reportByPercent)
- {
- long percentCurrent = SendTotal * 100 / receive;
- if (percent != percentCurrent)
- {
- percent = percentCurrent;
- if(report!=null) report.Action( SendTotal, receive );
- }
- }
- else
- {
- // 鎶ュ憡杩涘害
- if(report!=null) report.Action( SendTotal, receive );
- }
- }
-
- return OperateResult.CreateSuccessResult( );
- }
-
-
- /**
- * 浠庡鎺ュ瓧涓帴鏀舵墍鏈夌殑鏁版嵁鐒跺悗鍐欏叆鍒版祦褰撲腑鍘�
- * @param socket 缃戠粶濂楁帴瀛�
- * @param stream 杈撳嚭娴�
- * @param totalLength 鎬婚暱搴�
- * @param report 杩涘害鎶ュ憡
- * @param reportByPercent 杩涘害鎶ュ憡鏄惁鎸夌収鐧惧垎姣�
- * @return 缁撴灉绫诲璞�
- */
- protected OperateResult WriteStream(Socket socket, OutputStream stream, long totalLength, ActionOperateExTwo<Long, Long> report, boolean reportByPercent )
- {
- long count_receive = 0;
- long percent = 0;
- while (count_receive < totalLength)
- {
- // 鍏堜粠娴佷腑寮傛鎺ユ敹鏁版嵁
- OperateResultExTwo<Integer,byte[]> read = ReceiveBytesContentFromSocket( socket );
- if (!read.IsSuccess)
- {
- OperateResult result = new OperateResult();
- result.Message = read.Message;
- return result;
- }
- count_receive += read.Content1;
-
- // 寮�濮嬪啓鍏ユ枃浠舵祦
- OperateResult write = WriteStream( stream, read.Content2 );
- if (!write.IsSuccess)
- {
- OperateResult result = new OperateResult();
- result.Message = write.Message;
- return result;
- }
-
- // 鎶ュ憡杩涘害
- if (reportByPercent)
- {
- long percentCurrent = count_receive * 100 / totalLength;
- if (percent != percentCurrent)
- {
- percent = percentCurrent;
- if(report!=null) report.Action( count_receive, totalLength );
- }
- }
- else
- {
- if(report!=null) report.Action( count_receive, totalLength );
- }
-
- }
-
- return OperateResult.CreateSuccessResult( );
- }
-
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return
- */
- @Override
- public String toString()
- {
- return "NetworkXBase";
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AlienSession.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AlienSession.java
deleted file mode 100644
index 5f5f0bb..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AlienSession.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.StateOne;
-
-import java.net.Socket;
-
-/**
- * 寮傚舰瀹㈡埛绔殑瀵硅薄
- */
-public class AlienSession {
-
- /**
- * 瀹炰緥鍖栦竴涓粯璁ゅ璞�
- */
- public AlienSession()
- {
- this.isStatusOk = true;
- }
-
-
- /**
- * 鑾峰彇濂楁帴瀛�
- * @return
- */
- public Socket getSocket() {
- return socket;
- }
-
- /**
- * 璁剧疆濂楁帴瀛椾俊鎭�
- * @param socket 褰撳墠鐨勫��
- */
- public void setSocket(Socket socket) {
- this.socket = socket;
- }
-
- /**
- * 鑾峰彇璁惧鍞竴鐨凞TU瀵硅薄
- * @return
- */
- public String getDTU() {
- return DTU;
- }
-
- /**
- * 璁剧疆璁惧鐨勫敮涓�鐨凞TU淇℃伅
- * @param DTU
- */
- public void setDTU(String DTU) {
- this.DTU = DTU;
- }
-
- /**
- * 鑾峰彇褰撳墠鐨勮繛鎺ョ姸鎬佹槸鍚︽甯�
- * @return
- */
- public boolean getIsStatusOk() {
- return this.isStatusOk;
- }
-
- /**
- * 璁剧疆褰撳墠鐨勮繛鎺ョ姸鎬�
- * @param isStatusOk
- */
- public void setIsStatusOk(boolean isStatusOk) {
- this.isStatusOk = isStatusOk;
- }
-
-
-
-
- private Socket socket = null; // 缃戠粶濂楁帴瀛�
- private String DTU = ""; // 鍞竴鐨勬爣璇�
- private boolean isStatusOk = false; // 褰撳墠鐨勭綉缁滅姸鎬�
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AppSession.java b/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AppSession.java
deleted file mode 100644
index 2df2452..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AppSession.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.zy.common.HslCommunication.Core.Net.StateOne;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.Net.HslProtocol;
-
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.Date;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 缃戠粶浼氳瘽淇℃伅
- */
-public class AppSession {
-
- /**
- * 瀹炰緥鍖栦竴涓瀯閫犳柟娉�
- */
- public AppSession() {
-
- ClientUniqueID = SoftBasic.GetUniqueStringByGuidAndRandom();
- HybirdLockSend = new ReentrantLock();
- HeartTime = new Date();
- BytesHead = new byte[HslProtocol.HeadByteLength];
- }
-
-
- /**
- * 鑾峰彇IP鍦板潃淇℃伅
- * @return
- */
- public String getIpAddress() {
- return IpAddress;
- }
-
- /**
- * 璁剧疆IP鍦板潃淇℃伅
- * @param ipAddress
- */
- void setIpAddress(String ipAddress) {
- IpAddress = ipAddress;
- }
-
- /**
- * 鑾峰彇姝ゅ璞¤繛鎺ョ殑杩滅▼瀹㈡埛绔�
- * @return 杩滅▼瀹㈡埛绔�
- */
- public InetAddress getIpEndPoint() {
- return IpEndPoint;
- }
-
- /**
- * 璁剧疆姝ゅ璞＄殑杩滅▼杩炴帴瀹㈡埛绔�
- * @param ipEndPoint 杩滅▼瀹㈡埛绔�
- */
- public void setIpEndPoint(InetAddress ipEndPoint) {
- IpEndPoint = ipEndPoint;
- }
-
- /**
- * 鑾峰彇杩滅▼瀵硅薄鐨勫埆鍚�
- * @return 鍒悕
- */
- public String getLoginAlias() {
- return LoginAlias;
- }
-
- /**
- * 璁剧疆杩滅▼瀵硅薄鐨勫埆鍚�
- * @param loginAlias 鍒悕
- */
- public void setLoginAlias(String loginAlias) {
- LoginAlias = loginAlias;
- }
-
- /**
- * 鑾峰彇褰撳墠鐨勫績璺虫椂闂�
- * @return 蹇冭烦鏃堕棿
- */
- public Date getHeartTime() {
- return HeartTime;
- }
-
- /**
- * 璁剧疆褰撳墠鐨勫績璺虫椂闂�
- * @param date 蹇冭烦鏃堕棿
- */
- public void setHeartTime(Date date){
- this.HeartTime = date;
- }
-
- /**
- * 鑾峰彇瀹㈡埛绔殑绫诲瀷
- * @return 瀹㈡埛绔被鍨�
- */
- public String getClientType() {
- return ClientType;
- }
-
- /**
- * 璁剧疆瀹㈡埛绔殑绫诲瀷
- * @param clientType 瀹㈡埛绔殑绫诲瀷
- */
- public void setClientType(String clientType) {
- ClientType = clientType;
- }
-
- /**
- * 鑾峰彇瀹㈡埛绔殑鍞竴鐨勬爣璇�
- * @return
- */
- public String getClientUniqueID() {
- return ClientUniqueID;
- }
-
-
- private String IpAddress = null;
- private InetAddress IpEndPoint = null;
- private String LoginAlias = null;
- private Date HeartTime = null;
- private String ClientType = null;
- private String ClientUniqueID = null;
- private byte[] BytesHead = null;
- private byte[] BytesContent = null;
- private String KeyGroup = null;
- private Socket WorkSocket = null;
- private Lock HybirdLockSend = null;
-
- /**
- * 鑾峰彇澶村瓙鑺備俊鎭�
- * @return 瀛楄妭鏁扮粍
- */
- public byte[] getBytesHead() {
- return BytesHead;
- }
-
- /**
- * 璁剧疆澶村瓙鑺備俊鎭�
- * @param bytesHead 澶村瓙鑺傛暟缁�
- */
- public void setBytesHead(byte[] bytesHead) {
- BytesHead = bytesHead;
- }
-
- /**
- * 鑾峰彇鍐呭瀛楄妭
- * @return 瀛楄妭鏁扮粍
- */
- public byte[] getBytesContent() {
- return BytesContent;
- }
-
- /**
- * 璁剧疆鍐呭瀛楄妭
- * @param bytesContent 瀛楄妭鏁扮粍
- */
- public void setBytesContent(byte[] bytesContent) {
- BytesContent = bytesContent;
- }
-
- /**
- * 鑾峰彇鐢ㄤ簬鍒嗙被鐨勫叧閿瓧
- * @return 鍏抽敭瀛�
- */
- public String getKeyGroup() {
- return KeyGroup;
- }
-
- /**
- * 璁剧疆鐢ㄤ簬鍒嗙被鐨勫叧閿瓧
- * @param keyGroup 鍏抽敭瀛�
- */
- public void setKeyGroup(String keyGroup) {
- KeyGroup = keyGroup;
- }
-
- /**
- * 鑾峰彇缃戠粶濂楁帴瀛�
- * @return socket瀵硅薄
- */
- public Socket getWorkSocket() {
- return WorkSocket;
- }
-
- /**
- * 璁剧疆缃戠粶濂楁帴瀛�
- * @param workSocket socket瀵硅薄
- */
- public void setWorkSocket(Socket workSocket) {
- WorkSocket = workSocket;
- }
-
- /**
- * 鑾峰彇鍚屾閿�
- * @return
- */
- public Lock getHybirdLockSend() {
- return HybirdLockSend;
- }
-
-
-
-
-
- /**
- * 娓呴櫎鏈鐨勬帴鏀跺唴瀹�
- */
- public void Clear() {
- BytesHead = new byte[HslProtocol.HeadByteLength];
- BytesContent = null;
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆锛屼互IP锛岀鍙ｏ紝瀹㈡埛绔悕绉扮粍鎴�
- * @return 瀛楃涓叉暟鎹�
- */
- @Override
- public String toString() {
- if (LoginAlias.isEmpty()) {
- return "[" + IpEndPoint.toString() + "]";
- } else {
- return "[" + IpEndPoint + "] [" + LoginAlias + "]";
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Security/HslSecurity.java b/src/main/java/com/zy/common/HslCommunication/Core/Security/HslSecurity.java
deleted file mode 100644
index 3247cdd..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Security/HslSecurity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zy.common.HslCommunication.Core.Security;
-
-public class HslSecurity {
-
- /// <summary>
- /// 鍔犲瘑鏂规硶锛屽彧瀵瑰綋鍓嶇殑绋嬪簭闆嗗紑鏀�
- /// </summary>
- /// <param name="enBytes">绛夊緟鍔犲瘑鐨勬暟鎹�</param>
- /// <returns>鍔犲瘑鍚庣殑鏁版嵁</returns>
- public static byte[] ByteEncrypt(byte[] enBytes) {
- if (enBytes == null) return null;
- byte[] result = new byte[enBytes.length];
- for (int i = 0; i < enBytes.length; i++) {
- result[i] = (byte) (enBytes[i] ^ 0xB5);
- }
- return result;
- }
-
-
- /// <summary>
- /// 瑙ｅ瘑鏂规硶锛屽彧瀵瑰綋鍓嶇殑绋嬪簭闆嗗紑鏀�
- /// </summary>
- /// <param name="deBytes">绛夊緟瑙ｅ瘑鐨勬暟鎹�</param>
- /// <returns>瑙ｅ瘑鍚庣殑鏁版嵁</returns>
- public static byte[] ByteDecrypt(byte[] deBytes) {
- return ByteEncrypt(deBytes);
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformBase.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformBase.java
deleted file mode 100644
index 31d76d0..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformBase.java
+++ /dev/null
@@ -1,545 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-import com.zy.common.HslCommunication.Utilities;
-
-
-/**
- * 瀛楄妭杞崲绫荤殑鍩虹被锛屾彁渚涗簡涓�浜涘熀纭�鐨勮浆鎹㈡柟娉�
- */
-public class ByteTransformBase implements IByteTransform {
-
- /**
- * 瀹炰緥鍖栦竴涓璞�
- */
- public ByteTransformBase(){
- this.dataFormat = DataFormat.DCBA;
- }
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇鍑篵ool缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return boolean鍊�
- */
- public boolean TransBool(byte[] buffer, int index) {
- return buffer[index] != 0x00;
- }
-
- /**
- * 缂撳瓨涓彁鍙朾yte缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return byte瀵硅薄
- */
- public byte TransByte(byte[] buffer, int index) {
- return buffer[index];
- }
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇byte鏁扮粍缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return byte鏁扮粍
- */
- public byte[] TransByte(byte[] buffer, int index, int length) {
- byte[] tmp = new byte[length];
- System.arraycopy(buffer, index, tmp, 0, length);
- return tmp;
- }
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return short瀵硅薄
- */
- public short TransInt16(byte[] buffer, int index) {
- return Utilities.getShort(buffer, index);
- }
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return short鏁扮粍瀵硅薄
- */
- public short[] TransInt16(byte[] buffer, int index, int length) {
- short[] tmp = new short[length];
- for (int i = 0; i < length; i++) {
- tmp[i] = TransInt16(buffer, index + 2 * i);
- }
- return tmp;
- }
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇int缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return int瀵硅薄
- */
- public int TransInt32(byte[] buffer, int index) {
- return Utilities.getInt(ByteTransDataFormat4(buffer, index),0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇int鏁扮粍缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return int鏁扮粍瀵硅薄
- */
- public int[] TransInt32(byte[] buffer, int index, int length) {
- int[] tmp = new int[length];
- for (int i = 0; i < length; i++) {
- tmp[i] = TransInt32(buffer, index + 4 * i);
- }
- return tmp;
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇long缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return long瀵硅薄
- */
- public long TransInt64(byte[] buffer, int index) {
- return Utilities.getLong(ByteTransDataFormat8(buffer, index),0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇long鏁扮粍缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return long鏁扮粍瀵硅薄
- */
- public long[] TransInt64(byte[] buffer, int index, int length) {
- long[] tmp = new long[length];
- for (int i = 0; i < length; i++) {
- tmp[i] = TransInt64(buffer, index + 8 * i);
- }
- return tmp;
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇float缁撴灉
- *
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return float瀵硅薄
- */
- public float TransSingle(byte[] buffer, int index) {
- return Utilities.getFloat(ByteTransDataFormat4(buffer, index),0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇float鏁扮粍缁撴灉
- *
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return float鏁扮粍瀵硅薄
- */
- public float[] TransSingle(byte[] buffer, int index, int length) {
- float[] tmp = new float[length];
- for (int i = 0; i < length; i++) {
- tmp[i] = TransSingle(buffer, index + 4 * i);
- }
- return tmp;
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇double缁撴灉
- *
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return double瀵硅薄
- */
- public double TransDouble(byte[] buffer, int index) {
- return Utilities.getDouble(ByteTransDataFormat8(buffer, index),0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇double鏁扮粍缁撴灉
- *
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return double鏁扮粍
- */
- public double[] TransDouble(byte[] buffer, int index, int length) {
- double[] tmp = new double[length];
- for (int i = 0; i < length; i++) {
- tmp[i] = TransDouble(buffer, index + 8 * i);
- }
- return tmp;
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇string缁撴灉锛屼娇鐢ㄦ寚瀹氱殑缂栫爜
- *
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @param length byte鏁扮粍闀垮害
- * @param encoding 瀛楃涓茬殑缂栫爜
- * @return string瀵硅薄
- */
- public String TransString(byte[] buffer, int index, int length, String encoding) {
- return Utilities.getString(TransByte(buffer, index, length), encoding);
- }
-
-
- /**
- * bool鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(boolean value) {
- return TransByte(new boolean[]{value});
- }
-
-
- /**
- * bool鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(boolean[] values) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length];
- for (int i = 0; i < values.length; i++) {
- if (values[i]) buffer[i] = 0x01;
- }
-
- return buffer;
- }
-
-
- /**
- * byte鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(byte value) {
- return new byte[]{value};
- }
-
- /**
- * short鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(short value) {
- return TransByte(new short[]{value});
- }
-
- /**
- * short鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(short[] values) {
- if (values == null) return null;
- byte[] buffer = new byte[values.length * 2];
- for (int i = 0; i < values.length; i++) {
- System.arraycopy(Utilities.getBytes(values[i]), 0, buffer, 2 * i, 2);
- }
- return buffer;
- }
-
-
- /**
- * int鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(int value) {
- return TransByte(new int[]{value});
- }
-
-
- /**
- * int鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(int[] values) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 4];
- for (int i = 0; i < values.length; i++) {
- System.arraycopy(ByteTransDataFormat4(Utilities.getBytes(values[i])), 0, buffer, 4 * i, 4);
- }
-
- return buffer;
- }
-
- /**
- * long鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(long value) {
- return TransByte(new long[]{value});
- }
-
-
- /**
- * long鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(long[] values) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 8];
- for (int i = 0; i < values.length; i++) {
- System.arraycopy(ByteTransDataFormat8(Utilities.getBytes(values[i])), 0, buffer, 8 * i, 8);
- }
-
- return buffer;
- }
-
-
- /**
- * float鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(float value) {
- return TransByte(new float[]{value});
- }
-
-
- /**
- * float鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(float[] values) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 4];
- for (int i = 0; i < values.length; i++) {
- System.arraycopy(ByteTransDataFormat4(Utilities.getBytes(values[i])), 0, buffer, 4 * i, 4);
- }
-
- return buffer;
- }
-
-
- /**
- * double鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(double value) {
- return TransByte(new double[]{value});
- }
-
- /**
- * double鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- *
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(double[] values) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 8];
- for (int i = 0; i < values.length; i++) {
- System.arraycopy(ByteTransDataFormat8(Utilities.getBytes(values[i])), 0, buffer, 8 * i, 8);
- }
-
- return buffer;
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勭紪鐮佸瓧绗︿覆杞寲缂撳瓨鏁版嵁
- *
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @param encoding 瀛楃涓茬殑缂栫爜鏂瑰紡
- * @return buffer鏁版嵁
- */
- public byte[] TransByte(String value, String encoding) {
- return Utilities.getBytes(value, encoding);
- }
-
-
- private DataFormat dataFormat = DataFormat.ABCD;
-
- /**
- * 璁剧疆鏁版嵁瑙ｆ瀽鐨勬牸寮忥紝ABCD锛孊ADC锛孋DAB锛孌CBA鏍煎紡
- *
- * @param dataFormat
- */
- public void setDataFormat(DataFormat dataFormat) {
- this.dataFormat = dataFormat;
- }
-
- /**
- * 鑾峰彇鏁版嵁瑙ｆ瀽鐨勬牸寮忥紝榛樿ABCD锛屽彲閫塀ADC锛孋DAB锛孌CBA鏍煎紡
- *
- * @return
- */
- public DataFormat getDataFormat() {
- return this.dataFormat;
- }
-
-
- /**
- * 鍙嶈浆澶氬瓧鑺傜殑鏁版嵁淇℃伅
- *
- * @param value 鏁版嵁瀛楄妭
- * @param Index 璧峰绱㈠紩锛岄粯璁ゅ�间负0
- * @return 瀹為檯瀛楄妭淇℃伅
- */
- protected byte[] ByteTransDataFormat4(byte[] value, int Index) {
- byte[] buffer = new byte[4];
- switch (dataFormat) {
- case ABCD: {
- buffer[0] = value[Index + 3];
- buffer[1] = value[Index + 2];
- buffer[2] = value[Index + 1];
- buffer[3] = value[Index + 0];
- break;
- }
- case BADC: {
- buffer[0] = value[Index + 2];
- buffer[1] = value[Index + 3];
- buffer[2] = value[Index + 0];
- buffer[3] = value[Index + 1];
- break;
- }
- case CDAB: {
- buffer[0] = value[Index + 1];
- buffer[1] = value[Index + 0];
- buffer[2] = value[Index + 3];
- buffer[3] = value[Index + 2];
- break;
- }
- case DCBA: {
- buffer[0] = value[Index + 0];
- buffer[1] = value[Index + 1];
- buffer[2] = value[Index + 2];
- buffer[3] = value[Index + 3];
- break;
- }
- }
- return buffer;
- }
-
-
- /**
- * 鍙嶈浆澶氬瓧鑺傜殑鏁版嵁淇℃伅
- *
- * @param value 鏁版嵁瀛楄妭
- * @return 瀹為檯瀛楄妭淇℃伅
- */
- protected byte[] ByteTransDataFormat4(byte[] value) {
- return ByteTransDataFormat4(value, 0);
- }
-
-
- /**
- * 鍙嶈浆澶氬瓧鑺傜殑鏁版嵁淇℃伅
- *
- * @param value 鏁版嵁瀛楄妭
- * @param Index 璧峰绱㈠紩锛岄粯璁ゅ�间负0
- * @return 瀹為檯瀛楄妭淇℃伅
- */
- protected byte[] ByteTransDataFormat8(byte[] value, int Index) {
- byte[] buffer = new byte[8];
- switch (dataFormat) {
- case ABCD: {
- buffer[0] = value[Index + 7];
- buffer[1] = value[Index + 6];
- buffer[2] = value[Index + 5];
- buffer[3] = value[Index + 4];
- buffer[4] = value[Index + 3];
- buffer[5] = value[Index + 2];
- buffer[6] = value[Index + 1];
- buffer[7] = value[Index + 0];
- break;
- }
- case BADC: {
- buffer[0] = value[Index + 6];
- buffer[1] = value[Index + 7];
- buffer[2] = value[Index + 4];
- buffer[3] = value[Index + 5];
- buffer[4] = value[Index + 2];
- buffer[5] = value[Index + 3];
- buffer[6] = value[Index + 0];
- buffer[7] = value[Index + 1];
- break;
- }
-
- case CDAB: {
- buffer[0] = value[Index + 1];
- buffer[1] = value[Index + 0];
- buffer[2] = value[Index + 3];
- buffer[3] = value[Index + 2];
- buffer[4] = value[Index + 5];
- buffer[5] = value[Index + 4];
- buffer[6] = value[Index + 7];
- buffer[7] = value[Index + 6];
- break;
- }
- case DCBA: {
- buffer[0] = value[Index + 0];
- buffer[1] = value[Index + 1];
- buffer[2] = value[Index + 2];
- buffer[3] = value[Index + 3];
- buffer[4] = value[Index + 4];
- buffer[5] = value[Index + 5];
- buffer[6] = value[Index + 6];
- buffer[7] = value[Index + 7];
- break;
- }
- }
- return buffer;
- }
-
-
- /**
- * 鍙嶈浆澶氬瓧鑺傜殑鏁版嵁淇℃伅
- *
- * @param value 鏁版嵁瀛楄妭
- * @return 瀹為檯瀛楄妭淇℃伅
- */
- protected byte[] ByteTransDataFormat8(byte[] value) {
- return ByteTransDataFormat8(value, 0);
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformHelper.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformHelper.java
deleted file mode 100644
index 992187e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformHelper.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.Types.FunctionOperateExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-
-public class ByteTransformHelper {
-
- /**
- * 缁撴灉杞崲鎿嶄綔鐨勫熀纭�鏂规硶锛岄渶瑕佹敮鎸佺被鍨嬶紝鍙婅浆鎹㈢殑濮旀墭
- * @param result 鏁版嵁婧�
- * @param translator 杞崲鏂瑰紡
- * @param <TResult> 缁撴灉绫诲瀷
- * @return 鏈�鏂扮殑缁撴灉瀵硅薄
- */
- public static <TResult> OperateResultExOne<TResult> GetResultFromBytes( OperateResultExOne<byte[]> result, FunctionOperateExOne<byte[], TResult> translator )
- {
- OperateResultExOne<TResult> tmp = new OperateResultExOne<TResult>( );
- try
- {
- if (result.IsSuccess)
- {
- tmp.Content = translator.Action( result.Content );
- tmp.IsSuccess = result.IsSuccess;
- }
- tmp.CopyErrorFromOther( result );
- }
- catch (Exception ex)
- {
- tmp.Message = "鏁版嵁杞寲澶辫触锛屾簮鏁版嵁锛�" + SoftBasic.ByteToHexString( result.Content ) + " 娑堟伅锛�" + ex.getMessage();
- }
-
- return tmp;
-
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Boolean> GetBoolResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], Boolean>(){
- @Override
- public Boolean Action(byte[] content) {
- return byteTransform.TransBool( content, 0 );
- }
- });
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Byte> GetByteResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result,new FunctionOperateExOne<byte[], Byte>(){
- @Override
- public Byte Action(byte[] content) {
- return byteTransform.TransByte( content, 0 );
- }
- });
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Short> GetInt16ResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result,new FunctionOperateExOne<byte[], Short>(){
- @Override
- public Short Action(byte[] content) {
- return byteTransform.TransInt16( content, 0 );
- }
- } );
- }
-
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Integer> GetInt32ResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], Integer>(){
- @Override
- public Integer Action(byte[] content) {
- return byteTransform.TransInt32( content, 0 );
- }
- });
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Long> GetInt64ResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], Long>(){
- @Override
- public Long Action(byte[] content) {
- return byteTransform.TransInt64( content, 0 );
- }
- });
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Float> GetSingleResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], Float>(){
- @Override
- public Float Action(byte[] content) {
- return byteTransform.TransSingle( content, 0 );
- }
- } );
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<Double> GetDoubleResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], Double>(){
- @Override
- public Double Action(byte[] content) {
- return byteTransform.TransDouble( content, 0 );
- }
- });
- }
-
-
- /**
- * 灏嗘寚瀹氱殑OperateResult绫诲瀷杞寲
- * @param result 鍘熷鐨勭被鍨�
- * @param byteTransform 鏁版嵁杞崲鏂规硶
- * @return 杞寲鍚庣殑绫诲瀷
- */
- public static OperateResultExOne<String> GetStringResultFromBytes( OperateResultExOne<byte[]> result, IByteTransform byteTransform )
- {
- return GetResultFromBytes( result, new FunctionOperateExOne<byte[], String>(){
- @Override
- public String Action(byte[] content) {
- return byteTransform.TransString( content, 0, content.length, "US-ASCII" );
- }
- } );
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/DataFormat.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/DataFormat.java
deleted file mode 100644
index bc319d5..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/DataFormat.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-/**
- * 搴旂敤浜庡瀛楄妭鏁版嵁鐨勮В鏋愭垨鏄敓鎴愭牸寮�
- */
-public enum DataFormat {
- /**
- * 鎸夌収椤哄簭鐨勬牸寮忕敓鎴愮殑瑙ｆ瀽瑙勫垯
- */
- ABCD,
- /**
- * 鎸夌収鍗曞瓧鍙嶈浆
- */
- BADC,
- /**
- * 鎸夌収鍙屽瓧鍙嶈浆
- */
- CDAB,
- /**
- * 鎸夌収鍊掑簭鎺掑簭
- */
- DCBA
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/IByteTransform.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/IByteTransform.java
deleted file mode 100644
index 4c22caf..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/IByteTransform.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-public interface IByteTransform {
-
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇鍑篵ool缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return boolean鍊�
- */
- boolean TransBool( byte[] buffer, int index );
-
- /**
- * 缂撳瓨涓彁鍙朾yte缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return byte瀵硅薄
- */
- byte TransByte( byte[] buffer, int index );
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇byte鏁扮粍缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return
- */
- byte[] TransByte( byte[] buffer, int index, int length );
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return short瀵硅薄
- */
- short TransInt16( byte[] buffer, int index );
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return short鏁扮粍瀵硅薄
- */
- short[] TransInt16( byte[] buffer, int index, int length );
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇int缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return int瀵硅薄
- */
- int TransInt32( byte[] buffer, int index );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇int鏁扮粍缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return int鏁扮粍瀵硅薄
- */
- int[] TransInt32( byte[] buffer, int index, int length );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇long缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return long瀵硅薄
- */
- long TransInt64( byte[] buffer, int index );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇long鏁扮粍缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return long鏁扮粍瀵硅薄
- */
- long[] TransInt64( byte[] buffer, int index, int length );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇float缁撴灉
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return float瀵硅薄
- */
- float TransSingle( byte[] buffer, int index );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇float鏁扮粍缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return float鏁扮粍瀵硅薄
- */
- float[] TransSingle( byte[] buffer, int index, int length );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇double缁撴灉
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return double瀵硅薄
- */
- double TransDouble( byte[] buffer, int index );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇double鏁扮粍缁撴灉
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @param length 璇诲彇鐨勬暟缁勯暱搴�
- * @return double鏁扮粍
- */
- double[] TransDouble( byte[] buffer, int index, int length );
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇string缁撴灉锛屼娇鐢ㄦ寚瀹氱殑缂栫爜
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @param length byte鏁扮粍闀垮害
- * @param encoding 瀛楃涓茬殑缂栫爜
- * @return string瀵硅薄
- */
- String TransString( byte[] buffer, int index, int length, String encoding );
-
-
-
-
-
-
-
-
-
-
-
- /**
- * bool鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( boolean value );
-
-
- /**
- * bool鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( boolean[] values );
-
-
- /**
- * byte鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( byte value );
-
- /**
- * short鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( short value );
-
- /**
- * short鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( short[] values );
-
-
- /**
- * int鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( int value );
-
-
- /**
- * int鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( int[] values );
-
- /**
- * long鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( long value );
-
-
- /**
- * long鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return v
- */
- byte[] TransByte( long[] values );
-
-
- /**
- * float鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( float value );
-
-
- /**
- * float鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( float[] values );
-
-
- /**
- * double鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( double value );
-
- /**
- * double鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- byte[] TransByte( double[] values );
-
- /**
- * 浣跨敤鎸囧畾鐨勭紪鐮佸瓧绗︿覆杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @param encoding 瀛楃涓茬殑缂栫爜鏂瑰紡
- * @return buffer鏁版嵁
- */
- byte[] TransByte( String value, String encoding );
-
-
- /**
- * 璁剧疆鏁版嵁瑙ｆ瀽鐨勬牸寮忥紝ABCD锛孊ADC锛孋DAB锛孌CBA鏍煎紡
- * @param dataFormat
- */
- void setDataFormat( DataFormat dataFormat );
-
- /**
- * 鑾峰彇鏁版嵁瑙ｆ瀽鐨勬牸寮忥紝榛樿ABCD锛屽彲閫塀ADC锛孋DAB锛孌CBA鏍煎紡
- * @return
- */
- DataFormat getDataFormat();
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/RegularByteTransform.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/RegularByteTransform.java
deleted file mode 100644
index fb20d6e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/RegularByteTransform.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-public class RegularByteTransform extends ByteTransformBase
-{
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseBytesTransform.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseBytesTransform.java
deleted file mode 100644
index 94fccac..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseBytesTransform.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * 鍙嶈浆鐨勫瓧鑺傚彉鎹㈢被
- */
-public class ReverseBytesTransform extends ByteTransformBase
-{
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return short瀵硅薄
- */
- @Override
- public short TransInt16( byte[] buffer, int index ) {
- byte[] tmp = new byte[2];
- tmp[0] = buffer[1 + index];
- tmp[1] = buffer[0 + index];
- return Utilities.getShort(tmp, 0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇int缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return int瀵硅薄
- */
- @Override
- public int TransInt32( byte[] buffer, int index ) {
- byte[] tmp = new byte[4];
- tmp[0] = buffer[3 + index];
- tmp[1] = buffer[2 + index];
- tmp[2] = buffer[1 + index];
- tmp[3] = buffer[0 + index];
- return Utilities.getInt(ByteTransDataFormat4(tmp),0);
- }
-
-
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇long缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return long瀵硅薄
- */
- @Override
- public long TransInt64( byte[] buffer, int index ) {
- byte[] tmp = new byte[8];
- tmp[0] = buffer[7 + index];
- tmp[1] = buffer[6 + index];
- tmp[2] = buffer[5 + index];
- tmp[3] = buffer[4 + index];
- tmp[4] = buffer[3 + index];
- tmp[5] = buffer[2 + index];
- tmp[6] = buffer[1 + index];
- tmp[7] = buffer[0 + index];
- return Utilities.getLong(ByteTransDataFormat8(tmp), 0);
- }
-
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇float缁撴灉
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return float瀵硅薄
- */
- @Override
- public float TransSingle( byte[] buffer, int index ) {
- byte[] tmp = new byte[4];
- tmp[0] = buffer[3 + index];
- tmp[1] = buffer[2 + index];
- tmp[2] = buffer[1 + index];
- tmp[3] = buffer[0 + index];
- return Utilities.getFloat(ByteTransDataFormat4(tmp), 0);
- }
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇double缁撴灉
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @return double瀵硅薄
- */
- @Override
- public double TransDouble( byte[] buffer, int index ) {
- byte[] tmp = new byte[8];
- tmp[0] = buffer[7 + index];
- tmp[1] = buffer[6 + index];
- tmp[2] = buffer[5 + index];
- tmp[3] = buffer[4 + index];
- tmp[4] = buffer[3 + index];
- tmp[5] = buffer[2 + index];
- tmp[6] = buffer[1 + index];
- tmp[7] = buffer[0 + index];
- return Utilities.getDouble(ByteTransDataFormat8(tmp), 0);
- }
-
-
-
-
-
-
- /**
- * short鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( short[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 2];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- Utilities.bytesReverse(tmp);
- System.arraycopy(tmp, 0, buffer, 2 * i, tmp.length);
- }
-
- return buffer;
- }
-
-
-
- /**
- * int鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( int[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 4];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- Utilities.bytesReverse(tmp);
- System.arraycopy(ByteTransDataFormat4(tmp), 0, buffer, 4 * i, tmp.length);
- }
-
- return buffer;
- }
-
-
- /**
- * long鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( long[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 8];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- Utilities.bytesReverse(tmp);
- System.arraycopy(ByteTransDataFormat8(tmp), 0, buffer, 8 * i, tmp.length);
- }
-
- return buffer;
- }
-
-
-
- /**
- * float鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( float[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 4];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- Utilities.bytesReverse(tmp);
- System.arraycopy(ByteTransDataFormat4(tmp), 0, buffer, 4 * i, tmp.length);
- }
-
- return buffer;
- }
-
-
-
- /**
- * double鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( double[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 8];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- Utilities.bytesReverse(tmp);
- System.arraycopy(ByteTransDataFormat8(tmp), 0, buffer, 8 * i, tmp.length);
- }
-
- return buffer;
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseWordTransform.java b/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseWordTransform.java
deleted file mode 100644
index aad67de..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseWordTransform.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.zy.common.HslCommunication.Core.Transfer;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * 浠ュ瓧鑺備负鍗曚綅鐨勫彉鎹㈡搷浣�
- */
-public class ReverseWordTransform extends ByteTransformBase
-{
- /**
- * 瀹炰緥鍖栦竴涓粯璁ょ殑瀵硅薄
- */
- public ReverseWordTransform(){
- this.setDataFormat(DataFormat.ABCD);
- }
-
- /**
- * 鎸夌収瀛楄妭閿欎綅鐨勬柟娉�
- * @param buffer 瀹為檯鐨勫瓧鑺傛暟鎹�
- * @param index 璧峰瀛楄妭浣嶇疆
- * @param length 鏁版嵁闀垮害
- * @return
- */
- private byte[] ReverseBytesByWord( byte[] buffer, int index, int length )
- {
- byte[] tmp = new byte[length];
-
- for (int i = 0; i < length; i++)
- {
- tmp[i] = buffer[index + i];
- }
-
- for (int i = 0; i < length / 2; i++)
- {
- byte b = tmp[i * 2 + 0];
- tmp[i * 2 + 0] = tmp[i * 2 + 1];
- tmp[i * 2 + 1] = b;
- }
-
- return tmp;
- }
-
- private byte[] ReverseBytesByWord( byte[] buffer )
- {
- return ReverseBytesByWord( buffer, 0, buffer.length );
- }
-
-
- /**
- * 瀛楃涓叉暟鎹槸鍚︽寜鐓у瓧鏉ュ弽杞�
- */
- public boolean IsStringReverse =false;
-
-
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇short缁撴灉
- * @param buffer 缂撳瓨鏁版嵁
- * @param index 绱㈠紩浣嶇疆
- * @return short瀵硅薄
- */
- @Override
- public short TransInt16( byte[] buffer, int index ) {
- return Utilities.getShort(ReverseBytesByWord(buffer, index, 2), 0);
- }
-
-
-
- /**
- * 浠庣紦瀛樹腑鎻愬彇string缁撴灉锛屼娇鐢ㄦ寚瀹氱殑缂栫爜
- * @param buffer 缂撳瓨瀵硅薄
- * @param index 绱㈠紩浣嶇疆
- * @param length byte鏁扮粍闀垮害
- * @param encoding 瀛楃涓茬殑缂栫爜
- * @return string瀵硅薄
- */
- @Override
- public String TransString( byte[] buffer, int index, int length, String encoding ) {
- byte[] tmp = TransByte(buffer, index, length);
-
- if (IsStringReverse) {
- return Utilities.getString(ReverseBytesByWord(tmp), "ASCII");
- } else {
- return Utilities.getString(tmp, "ASCII");
- }
- }
-
-
-
- /**
- * bool鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( boolean[] values ) {
- return SoftBasic.BoolArrayToByte(values);
- }
-
-
-
- /**
- * short鏁扮粍鍙橀噺杞寲缂撳瓨鏁版嵁
- * @param values 绛夊緟杞寲鐨勬暟缁�
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( short[] values ) {
- if (values == null) return null;
-
- byte[] buffer = new byte[values.length * 2];
- for (int i = 0; i < values.length; i++) {
- byte[] tmp = Utilities.getBytes(values[i]);
- System.arraycopy(tmp, 0, buffer, 2 * i, tmp.length);
- }
-
- return ReverseBytesByWord(buffer);
- }
-
-
-
- /**
- * 浣跨敤鎸囧畾鐨勭紪鐮佸瓧绗︿覆杞寲缂撳瓨鏁版嵁
- * @param value 绛夊緟杞寲鐨勬暟鎹�
- * @param encoding 瀛楃涓茬殑缂栫爜鏂瑰紡
- * @return buffer鏁版嵁
- */
- @Override
- public byte[] TransByte( String value, String encoding ) {
- if (value == null) return null;
- byte[] buffer = Utilities.getBytes(value, encoding);
- buffer = SoftBasic.ArrayExpandToLengthEven(buffer);
- if (IsStringReverse) {
- return ReverseBytesByWord(buffer);
- } else {
- return buffer;
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperate.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperate.java
deleted file mode 100644
index dd8224b..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperate.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 绌烘搷浣滅殑绫�
- */
-public class ActionOperate
-{
- /**
- * 绌烘搷浣�
- */
- public void Action(){
-
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExOne.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExOne.java
deleted file mode 100644
index 99b36cb..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExOne.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 甯︿竴涓弬鏁板璞＄殑鎿嶄綔绫�
- * @param <T>
- */
-public class ActionOperateExOne<T>
-{
- /**
- * 甯︿竴涓弬鏁板璞＄殑绌烘搷浣�
- * @param content 绫诲瀷瀵硅薄
- */
- public void Action(T content)
- {
-
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExThree.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExThree.java
deleted file mode 100644
index c8aef5e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExThree.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 甯︿笁涓弬鏁扮殑绫诲瀷瀵硅薄
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @param <T3> 绫诲瀷涓�
- */
-public class ActionOperateExThree<T1,T2,T3>
-{
- /**
- * 瀹為檯鐨勬搷浣滄柟娉曪紝闇�瑕佺户鎵块噸鍐�
- * @param content1 绫诲瀷涓�瀵硅薄
- * @param content2 绫诲瀷浜屽璞�
- * @param content3 绫诲瀷涓夊璞�
- */
- public void Action(T1 content1,T2 content2,T3 content3){
-
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExTwo.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExTwo.java
deleted file mode 100644
index f8ed2d9..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExTwo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 甯︿簩涓弬鏁板璞＄殑鎿嶄綔绫�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- */
-public class ActionOperateExTwo <T1,T2>
-{
- /**
- * 瀹為檯鐨勬搷浣滄柟娉曪紝搴旇閲嶅啓
- * @param content1 绫诲瀷涓�瀵硅薄
- * @param content2 绫诲瀷浜屽璞�
- */
- public void Action(T1 content1,T2 content2)
- {
-
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperate.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperate.java
deleted file mode 100644
index a18f894..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperate.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-public class FunctionOperate<R>
-{
- public R Action(){
- return null;
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperateExOne.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperateExOne.java
deleted file mode 100644
index 48aebaa..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperateExOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-public class FunctionOperateExOne<T,R>
-{
- public R Action(T content){
- return null;
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/HslTimeOut.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/HslTimeOut.java
deleted file mode 100644
index a929704..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/HslTimeOut.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-import java.net.Socket;
-import java.util.Date;
-
-public class HslTimeOut {
-
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犲嚱鏁�
- */
- public HslTimeOut()
- {
- StartTime = new Date();
- IsSuccessful = false;
- }
-
-
- /**
- * 鎿嶄綔鐨勫紑濮嬫椂闂�
- */
- public Date StartTime = null;
-
-
- /**
- * 鎿嶄綔鏄惁鎴愬姛
- */
- public boolean IsSuccessful = false;
-
-
- /**
- * 寤舵椂鐨勬椂闂达紝鍗曚綅锛氭绉�
- */
- public int DelayTime = 5000;
-
-
- /**
- * 褰撳墠鐨勭綉缁滈�氳鐨勬牳蹇�
- */
- public Socket WorkSocket = null;
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/IDataTransfer.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/IDataTransfer.java
deleted file mode 100644
index 956dc6d..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/IDataTransfer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 鐢ㄤ簬PLC閫氳鍙奙odbus鑷畾涔夋暟鎹被鍨嬬殑璇诲啓鎿嶄綔
- */
-public interface IDataTransfer {
-
- /**
- * 璇诲彇鐨勬暟鎹暱搴︼紝瀵逛簬瑗块棬瀛愶紝绛夊悓浜庡瓧鑺傛暟锛屽浜庝笁鑿卞拰Modbus涓哄瓧鑺傛暟鐨勪竴鍗�
- * @return
- */
- short getReadCount();
-
-
- /**
- * 浠庡瓧鑺傛暟缁勮繘琛岃В鏋愬疄闄呯殑瀵硅薄
- * @param Content 瀹為檯鐨勫唴瀹�
- */
- void ParseSource(byte[] Content);
-
- /**
- * 灏嗗璞＄敓鎴愬瓧绗︽簮锛屽啓鍏LC涓�
- * @return 鍐欏叆PLC涓�
- */
- byte[] ToSource();
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResult.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResult.java
deleted file mode 100644
index 7256bc2..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResult.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-import com.zy.common.HslCommunication.StringResources;
-
-/**
- * 涓�涓粨鏋滄搷浣滅被鐨勫熀绫�
- */
-public class OperateResult {
-
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public OperateResult(){
-
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param msg 閿欒鐨勬秷鎭�
- */
- public OperateResult(String msg){
- this.Message = msg;
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勯敊璇彿鍜屾秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param err 閿欒鐮�
- * @param msg 閿欒娑堟伅
- */
- public OperateResult(int err,String msg){
- this.ErrorCode = err;
- this.Message = msg;
- }
-
-
- /**
- * 鎸囩ず鏈璁块棶鏄惁鎴愬姛
- */
- public boolean IsSuccess = false;
-
-
- /**
- * 鍏蜂綋鐨勯敊璇弿杩�
- */
- public String Message = StringResources.Language.UnknownError();
-
-
- /**
- * 鍏蜂綋鐨勯敊璇唬鐮�
- */
- public int ErrorCode = 10000;
-
-
- /**
- * @return 鑾峰彇閿欒浠ｅ彿鍙婃枃鏈弿杩�
- */
- public String ToMessageShowString() {
- return "閿欒浠ｇ爜锛�" + ErrorCode + "\r\n閿欒淇℃伅锛�" + Message;
- }
-
-
- /**
- * 浠庡彟涓�涓粨鏋滅被涓嫹璐濋敊璇俊鎭�
- *
- * @param result 鏀寔缁撴灉绫诲強娲剧敓绫�
- */
- public void CopyErrorFromOther(OperateResult result) {
- if (result != null) {
- ErrorCode = result.ErrorCode;
- Message = result.Message;
- }
-
- }
-
-
- /**
- * 鍒涘缓涓�涓垚鍔熺殑缁撴灉绫诲璞�
- *
- * @return 缁撴灉绫诲璞�
- */
- public static OperateResult CreateSuccessResult() {
- OperateResult result = new OperateResult();
- result.IsSuccess = true;
- result.Message = "success";
- return result;
- }
-
-
-}
-
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExFour.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExFour.java
deleted file mode 100644
index 395b26f..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExFour.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 甯︿笁涓弬鏁扮殑娉涘瀷绫诲璞�
- * @param <T1> 鍙傛暟涓�
- * @param <T2> 鍙傛暟浜�
- * @param <T3> 鍙傛暟涓�
- * @param <T4> 鍙傛暟鍥�
- */
-public class OperateResultExFour<T1,T2,T3,T4> extends OperateResult
-{
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public OperateResultExFour(){
- super();
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExFour(String msg){
- super(msg);
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勯敊璇彿鍜屾秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param err 閿欒鐮�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExFour(int err,String msg){
- super(err,msg);
- }
-
-
-
- /**
- * 娉涘瀷瀵硅薄1
- */
- public T1 Content1 = null;
-
-
- /**
- * 娉涘瀷瀵硅薄浜�
- */
- public T2 Content2 = null;
-
-
- /**
- * 娉涘瀷瀵硅薄涓�
- */
- public T3 Content3 = null;
-
- /**
- * 娉涘瀷瀵硅薄鍥�
- */
- public T4 Content4 = null;
-
-
- /**
- * 鍒涘缓涓�涓垚鍔熺殑娉涘瀷绫荤粨鏋滃璞�
- * @param content1 鍐呭涓�
- * @param content2 鍐呭浜�
- * @param content3 鍐呭涓�
- * @param content4 鍐呭鍥�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @param <T3> 绫诲瀷涓�
- * @param <T4> 绫诲瀷鍥�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2,T3,T4> OperateResultExFour<T1,T2,T3,T4> CreateSuccessResult(T1 content1,T2 content2,T3 content3,T4 content4){
- OperateResultExFour<T1,T2,T3,T4> result = new OperateResultExFour<>();
- result.IsSuccess = true;
- result.Content1 = content1;
- result.Content2 = content2;
- result.Content3 = content3;
- result.Content4 = content4;
- result.Message = "success";
- return result;
- }
-
-
- /**
- * 鍒涘缓涓�涓け璐ョ殑娉涘瀷绫荤粨鏋滃璞�
- * @param result 澶嶅埗鐨勭粨鏋滃璞�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @param <T3> 绫诲瀷涓�
- * @param <T4> 绫诲瀷鍥�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2,T3,T4> OperateResultExFour<T1,T2,T3,T4> CreateFailedResult(OperateResult result){
- OperateResultExFour resultExFour = new OperateResultExFour();
- resultExFour.CopyErrorFromOther(result);
- return resultExFour;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExOne.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExOne.java
deleted file mode 100644
index b31ff41..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExOne.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-
-/**
- * 甯︿竴涓弬鏁扮殑缁撴灉绫诲璞�
- * @param <T>
- */
-public class OperateResultExOne<T> extends OperateResult
-{
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public OperateResultExOne(){
- super();
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExOne(String msg){
- super(msg);
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勯敊璇彿鍜屾秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param err 閿欒鐮�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExOne(int err,String msg){
- super(err,msg);
- }
-
-
- /**
- * 娉涘瀷鍙傛暟瀵硅薄
- */
- public T Content = null;
-
-
- /**
- * 鍒涘缓涓�涓け璐ョ殑瀵硅薄
- * @param result 澶辫触鐨勭粨鏋�
- * @param <T> 绫诲瀷鍙傛暟
- * @return 缁撴灉绫诲璞�
- */
- public static <T> OperateResultExOne<T> CreateFailedResult(OperateResult result){
- OperateResultExOne<T> resultExOne = new OperateResultExOne<T>();
- resultExOne.CopyErrorFromOther(result);
- return resultExOne;
- }
-
-
- /**
- * 鍒涘缓涓�涓垚鍔熺殑娉涘瀷绫荤粨鏋滃璞�
- * @param content 鍐呭
- * @param <T> 绫诲瀷
- * @return 缁撴灉绫诲璞�
- */
- public static <T> OperateResultExOne<T> CreateSuccessResult(T content){
- OperateResultExOne<T> result = new OperateResultExOne<T>();
- result.IsSuccess = true;
- result.Content = content;
- result.Message = "success";
- return result;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExThree.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExThree.java
deleted file mode 100644
index 951f9aa..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExThree.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-
-/**
- * 甯︿笁涓弬鏁扮殑娉涘瀷绫诲璞�
- * @param <T1> 鍙傛暟涓�
- * @param <T2> 鍙傛暟浜�
- * @param <T3> 鍙傛暟涓�
- */
-public class OperateResultExThree<T1,T2,T3> extends OperateResult
-{
-
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public OperateResultExThree(){
- super();
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExThree(String msg){
- super(msg);
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勯敊璇彿鍜屾秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param err 閿欒鐮�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExThree(int err,String msg){
- super(err,msg);
- }
-
-
-
- /**
- * 娉涘瀷瀵硅薄1
- */
- public T1 Content1 = null;
-
-
- /**
- * 娉涘瀷瀵硅薄浜�
- */
- public T2 Content2 = null;
-
-
- /**
- * 娉涘瀷瀵硅薄涓�
- */
- public T3 Content3 = null;
-
-
-
- /**
- * 鍒涘缓涓�涓垚鍔熺殑娉涘瀷绫荤粨鏋滃璞�
- * @param content1 鍐呭涓�
- * @param content2 鍐呭浜�
- * @param content3 鍐呭涓�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @param <T3> 绫诲瀷涓�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2,T3> OperateResultExThree<T1,T2,T3> CreateSuccessResult(T1 content1,T2 content2,T3 content3){
- OperateResultExThree<T1,T2,T3> result = new OperateResultExThree<>();
- result.IsSuccess = true;
- result.Content1 = content1;
- result.Content2 = content2;
- result.Content3 = content3;
- result.Message = "success";
- return result;
- }
-
-
-
- /**
- * 鍒涘缓涓�涓け璐ョ殑娉涘瀷绫荤粨鏋滃璞�
- * @param result 澶嶅埗鐨勭粨鏋滃璞�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @param <T3> 绫诲瀷涓�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2,T3> OperateResultExThree<T1,T2,T3> CreateFailedResult(OperateResult result){
- OperateResultExThree resultExThree = new OperateResultExThree();
- resultExThree.CopyErrorFromOther(result);
- return resultExThree;
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExTwo.java b/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExTwo.java
deleted file mode 100644
index fe01c66..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExTwo.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.zy.common.HslCommunication.Core.Types;
-
-/**
- * 甯�2涓弬鏁扮殑缁撴灉绫�
- * @param <T1> 绗竴涓弬鏁扮被鍨�
- * @param <T2> 绗簩涓弬鏁扮被鍨�
- */
-public class OperateResultExTwo<T1,T2> extends OperateResult
-{
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犳柟娉�
- */
- public OperateResultExTwo(){
- super();
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExTwo(String msg){
- super(msg);
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勯敊璇彿鍜屾秷鎭疄渚嬪寲榛樿鐨勫璞�
- * @param err 閿欒鐮�
- * @param msg 閿欒娑堟伅
- */
- public OperateResultExTwo(int err,String msg){
- super(err,msg);
- }
-
-
-
-
- /**
- * 娉涘瀷瀵硅薄1
- */
- public T1 Content1 = null;
-
-
- /**
- * 娉涘瀷瀵硅薄浜�
- */
- public T2 Content2 = null;
-
- /**
- * 鍒涘缓涓�涓垚鍔熺殑娉涘瀷绫荤粨鏋滃璞�
- * @param content1 鍐呭涓�
- * @param content2 鍐呭浜�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2> OperateResultExTwo<T1,T2> CreateSuccessResult(T1 content1,T2 content2){
- OperateResultExTwo<T1,T2> result = new OperateResultExTwo<T1,T2>();
- result.IsSuccess = true;
- result.Content1 = content1;
- result.Content2 = content2;
- result.Message = "success";
- return result;
- }
-
- /**
- * 鍒涘缓涓�涓け璐ョ殑娉涘瀷绫荤粨鏋滃璞�
- * @param result 澶嶅埗鐨勭粨鏋滃璞�
- * @param <T1> 绫诲瀷涓�
- * @param <T2> 绫诲瀷浜�
- * @return 缁撴灉绫诲璞�
- */
- public static <T1,T2> OperateResultExTwo<T1,T2> CreateFailedResult(OperateResult result){
- OperateResultExTwo resultExTwo = new OperateResultExTwo();
- resultExTwo.CopyErrorFromOther(result);
- return resultExTwo;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Enthernet/ComplexNet/NetComplexClient.java b/src/main/java/com/zy/common/HslCommunication/Enthernet/ComplexNet/NetComplexClient.java
deleted file mode 100644
index db4dfed..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Enthernet/ComplexNet/NetComplexClient.java
+++ /dev/null
@@ -1,472 +0,0 @@
-package com.zy.common.HslCommunication.Enthernet.ComplexNet;
-
-import com.zy.common.HslCommunication.Core.Net.HslProtocol;
-import com.zy.common.HslCommunication.Core.Net.NetHandle;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkXBase;
-import com.zy.common.HslCommunication.Core.Net.StateOne.AppSession;
-import com.zy.common.HslCommunication.Core.Types.*;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.net.Socket;
-import java.util.Date;
-
-/**
- * 涓�涓熀浜庡紓姝ラ珮鎬ц兘鐨勫鎴风缃戠粶绫伙紝鏀寔涓诲姩鎺ユ敹鏈嶅姟鍣ㄧ殑娑堟伅
- */
-public class NetComplexClient extends NetworkXBase {
-
-
- /**
- * 瀹炰緥鍖栦竴涓璞�
- */
- public NetComplexClient() {
- session = new AppSession();
- ServerTime = new Date();
-
- }
-
-
- private AppSession session; // 瀹㈡埛绔殑鏍稿績杩炴帴瀵硅薄
- private int isConnecting = 0; // 鎸囩ず瀹㈡埛绔槸鍚﹀浜庤繛鎺ユ湇鍔″櫒涓紝0浠ｈ〃鏈繛鎺ワ紝1浠ｈ〃杩炴帴涓�
- private boolean IsQuie = false; // 鎸囩ず绯荤粺鏄惁鍑嗗閫�鍑�
- private Thread thread_heart_check = null; // 蹇冭烦绾跨▼
- private String ipAddress = ""; // Ip鍦板潃
- private int port = 1000; // 绔彛鍙�
- private boolean IsClientStart = false; // 瀹㈡埛绔槸鍚﹀惎鍔�
- private int ConnectFailedCount = 0; // 澶辫触閲嶈繛娆℃暟
- private String ClientAlias = ""; // 瀹㈡埛绔殑鍒悕
- private Date ServerTime = new Date(); // 鏈嶅姟鍣ㄧ殑鏃堕棿锛屾殏鏃朵笉鏀寔浣跨敤
- private int DelayTime = 0; // 鑾峰彇寤惰繜鐨勬椂闂�
-
- /**
- * 鑾峰彇IP鍦板潃
- *
- * @return Ip鍦板潃
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
- /**
- * 璁剧疆Ip鍦板潃
- *
- * @param ipAddress Ip鍦板潃
- */
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- /**
- * 鑾峰彇绔彛鍙�
- *
- * @return 绔彛鍙�
- */
- public int getPort() {
- return port;
- }
-
- /**
- * 璁剧疆绔彛鍙�
- *
- * @param port
- */
- public void setPort(int port) {
- this.port = port;
- }
-
- /**
- * 鑾峰彇瀹㈡埛绔槸鍚﹀惎鍔�
- *
- * @return boolean鍊�
- */
- public boolean getIsClientStart() {
- return IsClientStart;
- }
-
- /**
- * 璁剧疆瀹㈡埛绔槸鍚﹀惎鍔�
- *
- * @param clientStart 瀹㈡埛绔槸鍚﹀惎鍔�
- */
- public void setClientStart(boolean clientStart) {
- IsClientStart = clientStart;
- }
-
- /**
- * 鑾峰彇澶辫触閲嶈繛娆℃暟
- *
- * @return
- */
- public int getConnectFailedCount() {
- return ConnectFailedCount;
- }
-
- /**
- * 鑾峰彇瀹㈡埛绔殑鐧诲綍鏍囪瘑鍚�
- *
- * @return 瀛楃涓蹭俊鎭�
- */
- public String getClientAlias() {
- return ClientAlias;
- }
-
- /**
- * 璁剧疆瀹㈡埛绔殑鐧诲綍鏍囪瘑鍚�
- *
- * @param clientAlias
- */
- public void setClientAlias(String clientAlias) {
- ClientAlias = clientAlias;
- }
-
-
- /**
- * 鑾峰彇鏈嶅姟鍣ㄧ殑鏃堕棿
- * @return
- */
-// public Date getServerTime() {
-// return ServerTime;
-// }
-
- /**
- * 鑾峰彇淇℃伅寤惰繜鐨勬椂闂�
- *
- * @return
- */
- public int getDelayTime() {
- return DelayTime;
- }
-
-
- /**
- * 瀹㈡埛绔惎鍔ㄦ垚鍔熺殑浜嬩欢锛岄噸杩炴垚鍔熶篃灏嗚Е鍙戞浜嬩欢锛屽弬鏁版病鏈夋剰涔�
- */
- public ActionOperate LoginSuccess;
-
- /**
- * 杩炴帴澶辫触鏃惰Е鍙戠殑浜嬩欢锛屽弬鏁颁负杩炴帴澶辫触鐨勬鏁�
- */
- public ActionOperateExOne<Integer> LoginFailed;
-
- /**
- * 鏈嶅姟鍣ㄧ殑寮傚父锛屽惎鍔紝绛夌瓑涓�鑸秷鎭骇鐢熺殑鏃跺�欙紝鍑哄彂姝や簨浠�
- */
- public ActionOperateExOne<String> MessageAlerts;
-
- /**
- * 鍦ㄥ鎴风鏂紑鍚庡苟鍦ㄩ噸杩炴湇鍔″櫒涔嬪墠瑙﹀彂锛岀敤浜庢竻鐞嗙郴缁熻祫婧愶紝鍙傛暟鏃犳剰涔�
- */
- public ActionOperate BeforReConnected;
-
- /**
- * 褰撴帴鏀跺埌鏂囨湰鏁版嵁鐨勬椂鍊�,瑙﹀彂姝や簨浠�
- */
- public ActionOperateExThree<NetComplexClient, NetHandle, String> AcceptString;
-
- /**
- * 褰撴帴鏀跺埌瀛楄妭鏁版嵁鐨勬椂鍊�,瑙﹀彂姝や簨浠�
- */
- public ActionOperateExThree<NetComplexClient, NetHandle, byte[]> AcceptByte;
-
-
- /**
- * 鍏抽棴璇ュ鎴风寮曟搸
- */
- public void ClientClose() {
- IsQuie = true;
- if (IsClientStart)
- SendBytes(session, HslProtocol.CommandBytes(HslProtocol.ProtocolClientQuit, 0, Token, null));
-
- IsClientStart = false; // 鍏抽棴瀹㈡埛绔�
- thread_heart_check = null;
-
- LoginSuccess = null; // 娓呯┖鎵�鏈夌殑浜嬩欢
- LoginFailed = null;
- MessageAlerts = null;
- AcceptByte = null;
- AcceptString = null;
- try {
- session.getWorkSocket().close();
- } catch (Exception ex) {
-
- }
- if (LogNet != null) LogNet.WriteDebug(toString(), "Client Close.");
- }
-
-
- /**
- * 鍚姩瀹㈡埛绔紩鎿庯紝杩炴帴鏈嶅姟鍣ㄧ郴缁�
- */
- public void ClientStart() {
- // 濡傛灉澶勪簬杩炴帴涓氨閫�鍑�
- if (isConnecting != 0) return;
- isConnecting = 1;
-
- // 鍚姩鍚庡彴绾跨▼杩炴帴
- new Thread(){
- @Override
- public void run() {
- ThreadLogin();
- }
- }.start();
-
- // 鍚姩蹇冭烦绾跨▼锛屽湪绗竴娆tart鐨勬椂鍊�
- if (thread_heart_check == null) {
- thread_heart_check = new Thread(){
- @Override
- public void run() {
- ThreadHeartCheck();
- }
- };
- thread_heart_check.start();
- }
- }
-
- /**
- * 杩炴帴鏈嶅姟鍣ㄤ箣鍓嶇殑娑堟伅鎻愮ず锛屽鏋滄槸閲嶈繛鐨勮瘽锛屽氨鎻愮ず10绉掔瓑寰呬俊鎭�
- */
- private void AwaitToConnect() {
- if (ConnectFailedCount == 0) {
- // English Version : Connecting Server...
- if (MessageAlerts != null) MessageAlerts.Action("姝ｅ湪杩炴帴鏈嶅姟鍣�...");
- } else {
- int count = 10;
- while (count > 0) {
- if (IsQuie) return;
- count--;
- // English Version : Disconnected, wait [count] second to restart
- if (MessageAlerts != null) MessageAlerts.Action("杩炴帴鏂紑锛岀瓑寰�" + count + "绉掑悗閲嶆柊杩炴帴");
- try {
- Thread.sleep(1000);
- } catch (Exception ex) {
-
- }
- }
- if (MessageAlerts != null) MessageAlerts.Action("姝ｅ湪灏濊瘯绗�" + ConnectFailedCount + "娆¤繛鎺ユ湇鍔″櫒...");
- }
- }
-
- private void ConnectFailed() {
- ConnectFailedCount++;
- isConnecting = 0;
- if (LoginFailed != null) LoginFailed.Action(ConnectFailedCount);
- if (LogNet != null) LogNet.WriteDebug(toString(), "Connected Failed, Times: " + ConnectFailedCount);
- }
-
- private OperateResultExOne<Socket> ConnectServer() {
- OperateResultExOne<Socket> connectResult = CreateSocketAndConnect(ipAddress, port, 10000);
- if (!connectResult.IsSuccess) {
- return connectResult;
- }
-
- // 杩炴帴鎴愬姛锛屽彂閫佹暟鎹俊鎭�
- OperateResult sendResult = SendStringAndCheckReceive(connectResult.Content, 2, ClientAlias);
- if (!sendResult.IsSuccess) {
- return OperateResultExOne.<Socket>CreateFailedResult(sendResult);
- }
-
- if (MessageAlerts != null) MessageAlerts.Action("杩炴帴鏈嶅姟鍣ㄦ垚鍔燂紒");
- return connectResult;
- }
-
- private void LoginSuccessMethod(Socket socket) {
- ConnectFailedCount = 0;
- try {
- session.setIpEndPoint(socket.getInetAddress());
- session.setLoginAlias(ClientAlias);
- session.setWorkSocket(socket);
- session.setHeartTime(new Date());
- IsClientStart = true;
- BeginReceiveBackground(session);
- } catch (Exception ex) {
- if (LogNet != null) LogNet.WriteException(toString(), ex);
- }
- }
-
-
- private void ThreadLogin() {
- // 杩炴帴鐨勬秷鎭瓑寰�
- AwaitToConnect();
-
- OperateResultExOne<Socket> connectResult = ConnectServer();
- if (!connectResult.IsSuccess) {
- ConnectFailed();
- // 杩炴帴澶辫触锛岄噸鏂拌繛鎺ユ湇鍔″櫒
- new Thread(){
- @Override
- public void run() {
- ReconnectServer(null);
- }
- }.start();
- return;
- }
-
- // 鐧诲綍鎴愬姛
- LoginSuccessMethod(connectResult.Content);
-
- // 鐧诲綍鎴愬姛
- if (LoginSuccess != null) LoginSuccess.Action();
- isConnecting = 0;
- try {
- Thread.sleep(200);
- } catch (Exception ex) {
-
- }
- }
-
-
- private void ReconnectServer(Object obj) {
- // 鏄惁杩炴帴鏈嶅姟鍣ㄤ腑锛屽凡缁忓湪杩炴帴鐨勮瘽锛屽垯涓嶅啀杩炴帴
- if (isConnecting == 1) return;
- // 鏄惁閫�鍑轰簡绯荤粺锛岄��鍑哄垯涓嶅啀閲嶈繛
- if (IsQuie) return;
- // 瑙﹀彂杩炴帴澶辫触锛岄噸杩炵郴缁熷墠閿欒
- if (BeforReConnected != null) BeforReConnected.Action();
- if (session != null) {
- CloseSocket(session.getWorkSocket());
- }
- // 閲嶆柊鍚姩瀹㈡埛绔�
- ClientStart();
- }
-
-
- /**
- * 閫氫俊鍑洪敊鍚庣殑澶勭悊
- *
- * @param receive 閫氫俊鏂规硶
- */
- @Override
- protected void SocketReceiveException(AppSession receive) {
- if (LogNet != null) LogNet.WriteDebug(toString(), "Socket Excepiton Occured.");
- // 寮傚父鎺夌嚎
- ReconnectServer(null);
-
- }
-
-
- /**
- * 鏈嶅姟鍣ㄧ鐢ㄤ簬鏁版嵁鍙戦�佹枃鏈殑鏂规硶
- *
- * @param customer 鐢ㄦ埛鑷畾涔夌殑鍛戒护澶�
- * @param str 鍙戦�佺殑鏂囨湰
- */
- public void Send(NetHandle customer, String str) {
- if (IsClientStart) {
- SendBytes(session, HslProtocol.CommandBytes(customer.get_CodeValue(), Token, str));
- }
- }
-
-
- /**
- * 鏈嶅姟鍣ㄧ鐢ㄤ簬鍙戦�佸瓧鑺傜殑鏂规硶
- *
- * @param customer 鐢ㄦ埛鑷畾涔夌殑鍛戒护澶�
- * @param bytes 瀹為檯鍙戦�佺殑鏁版嵁
- */
- public void Send(NetHandle customer, byte[] bytes) {
- if (IsClientStart) {
- SendBytes(session, HslProtocol.CommandBytes(customer.get_CodeValue(), Token, bytes));
- }
- }
-
- private void SendBytes(AppSession stateone, byte[] content) {
- super.Send(stateone.getWorkSocket(), content);
- }
-
-
- /**
- * 瀹㈡埛绔殑鏁版嵁澶勭悊涓績
- *
- * @param session 杩炴帴鐘舵��
- * @param protocol 鍗忚澶�
- * @param customer 鐢ㄦ埛鑷畾涔�
- * @param content 鏁版嵁鍐呭
- */
- @Override
- protected void DataProcessingCenter(AppSession session, int protocol, int customer, byte[] content) {
- if (protocol == HslProtocol.ProtocolCheckSecends) {
- Date dt = new Date(Utilities.getLong(content, 0));
- ServerTime = new Date(Utilities.getLong(content, 8));
- DelayTime = (int) (new Date().getTime() - dt.getTime());
- this.session.setHeartTime(new Date());
- // MessageAlerts?.Invoke("蹇冭烦鏃堕棿锛�" + DateTime.Now.ToString());
- } else if (protocol == HslProtocol.ProtocolClientQuit) {
- // 鐢宠浜嗛��鍑�
- } else if (protocol == HslProtocol.ProtocolUserBytes) {
- // 鎺ユ敹鍒板瓧鑺傛暟鎹�
- if (AcceptByte != null) AcceptByte.Action(this, new NetHandle(customer), content);
- } else if (protocol == HslProtocol.ProtocolUserString) {
- // 鎺ユ敹鍒版枃鏈暟鎹�
- String str = Utilities.byte2String(content);
- if (AcceptString != null) AcceptString.Action(this, new NetHandle(customer), str);
- }
- }
-
-
- /**
- * 蹇冭烦绾跨▼鐨勬柟娉�
- */
- private void ThreadHeartCheck() {
- try {
- Thread.sleep(2000);
- } catch (Exception ex) {
-
- }
- while (true) {
- try {
- Thread.sleep(1000);
- } catch (Exception ex) {
-
- }
-
- if (!IsQuie) {
- byte[] send = new byte[16];
- byte[] buffer = Utilities.getBytes(new Date().getTime());
- System.arraycopy(buffer, 0, send, 0, buffer.length);
-
- try {
- SendBytes(session, HslProtocol.CommandBytes(HslProtocol.ProtocolCheckSecends, 0, Token, send));
- double timeSpan = (new Date().getTime() - session.getHeartTime().getTime()) / 1000;
- if (timeSpan > 1 * 8)//8娆℃病鏈夋敹鍒板け鍘昏仈绯�
- {
- if (isConnecting == 0) {
- if (LogNet != null)
- LogNet.WriteDebug(toString(), "Heart Check Failed int " + timeSpan + " Seconds.");
- new Thread(){
- @Override
- public void run() {
- ReconnectServer(null);
- }
- }.start();
- }
- if (!IsQuie) {
- try {
- Thread.sleep(1000);
- } catch (Exception ex) {
-
- }
- }
- }
-
- } catch (Exception ex) {
- System.out.println(ex.getStackTrace());
- }
- } else {
- break;
- }
- }
-
-
- }
-
-
- /**
- * 杩斿洖瀵硅薄鐨勫瓧绗︿覆琛ㄧず褰㈠紡
- *
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return "NetComplexClient";
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Enthernet/FileNet/FileBaseInfo.java b/src/main/java/com/zy/common/HslCommunication/Enthernet/FileNet/FileBaseInfo.java
deleted file mode 100644
index e2b49f3..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Enthernet/FileNet/FileBaseInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zy.common.HslCommunication.Enthernet.FileNet;
-
-public class FileBaseInfo {
-
- /**
- * 鑾峰彇鏂囦欢鐨勫悕绉�
- * @return
- */
- public String getName() {
- return Name;
- }
-
- /**
- * 璁剧疆鏂囦欢鐨勫悕绉�
- * @param name
- */
- public void setName(String name) {
- Name = name;
- }
-
- /**
- * 鑾峰彇鏂囦欢鐨勫ぇ灏�
- * @return
- */
- public long getSize() {
- return Size;
- }
-
- /**
- * 璁剧疆鏂囦欢鐨勫ぇ灏�
- * @param size
- */
- public void setSize(long size) {
- Size = size;
- }
-
- /**
- * 鑾峰彇鏂囦欢鐨勬爣璇嗭紝娉ㄩ噴
- * @return
- */
- public String getTag() {
- return Tag;
- }
-
- /**
- * 璁剧疆鏂囦欢鐨勬爣璇嗭紝娉ㄩ噴
- * @param tag
- */
- public void setTag(String tag) {
- Tag = tag;
- }
-
- /**
- * 鑾峰彇鏂囦欢鐨勪笂浼犱汉
- * @return
- */
- public String getUpload() {
- return Upload;
- }
-
- /**
- * 璁剧疆鏂囦欢鐨勪笂浼犱汉
- * @param upload
- */
- public void setUpload(String upload) {
- Upload = upload;
- }
-
- private String Name ; // 鏂囦欢鍚嶇О
- private long Size; // 鏂囦欢澶у皬
- private String Tag; // 鏂囦欢鐨勬爣璇嗭紝娉ㄩ噴
- private String Upload; // 鏂囦欢涓婁紶浜�
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Enthernet/PushNet/NetPushClient.java b/src/main/java/com/zy/common/HslCommunication/Enthernet/PushNet/NetPushClient.java
deleted file mode 100644
index fbe7b33..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Enthernet/PushNet/NetPushClient.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.zy.common.HslCommunication.Enthernet.PushNet;
-
-import com.zy.common.HslCommunication.Core.Net.HslProtocol;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkXBase;
-import com.zy.common.HslCommunication.Core.Net.StateOne.AppSession;
-import com.zy.common.HslCommunication.Core.Types.ActionOperateExTwo;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.net.Socket;
-
-public class NetPushClient extends NetworkXBase
-{
-
- /**
- * 瀹炰緥鍖栦竴涓彂甯冭闃呯被鐨勫鎴风锛岄渶瑕佹寚瀹歩p鍦板潃锛岀鍙ｏ紝鍙婅闃呭叧閿瓧
- * @param ipAddress 鏈嶅姟鍣ㄧ殑IP鍦板潃
- * @param port 鏈嶅姟鍣ㄧ殑绔彛鍙�
- * @param key 璁㈤槄鍏抽敭瀛�
- */
- public NetPushClient( String ipAddress, int port, String key )
- {
- this.ipAddress = ipAddress;
- this.port = port;
- keyWord = key;
-
- if (key == null || key.isEmpty())
- {
- throw new RuntimeException( "key 涓嶅厑璁镐负绌�" );
- }
- }
-
-
- @Override
- protected void DataProcessingCenter(AppSession session, int protocol, int customer, byte[] content ) {
- if (protocol == HslProtocol.ProtocolUserString) {
- if (action != null) action.Action(this, Utilities.byte2String(content));
- }
- }
-
-
- @Override
- protected void SocketReceiveException( AppSession session) {
- // 鍙戠敓寮傚父鐨勬椂鍊欓渶瑕佽繘琛岄噸鏂拌繛鎺�
- while (true) {
- System.out.print("10 绉掗挓鍚庡皾璇曢噸杩炴湇鍔″櫒");
- try {
- Thread.sleep(10000);
- }catch (Exception ex){
-
- }
-
- if (CreatePush().IsSuccess) {
- System.out.print("閲嶈繛鏈嶅姟鍣ㄦ垚鍔�");
- break;
- }
- }
- }
-
-
- private OperateResult CreatePush( )
- {
- CloseSocket(CoreSocket);
-
- OperateResultExOne<Socket> connect = CreateSocketAndConnect( ipAddress,port, 5000 );
- if (!connect.IsSuccess) return connect;
-
- OperateResult send = SendStringAndCheckReceive( connect.Content, 0, keyWord );
- if (!send.IsSuccess) return send;
-
- OperateResultExTwo<Integer, String> receive = ReceiveStringContentFromSocket( connect.Content );
- if (!receive.IsSuccess) return receive;
-
- if (receive.Content1 != 0)
- {
- OperateResult result = new OperateResult();
- result.Message = receive.Content2;
- return result;
- }
-
- AppSession appSession = new AppSession( );
- CoreSocket = connect.Content;
- appSession.setWorkSocket(connect.Content);
- BeginReceiveBackground( appSession );
-
- return OperateResult.CreateSuccessResult( );
- }
-
-
-
- /**
- * 鍒涘缓鏁版嵁鎺ㄩ�佹湇鍔�
- * @param pushCallBack 瑙﹀彂鏁版嵁鎺ㄩ�佺殑濮旀墭
- * @return 鏄惁鎴愬姛
- */
- public OperateResult CreatePush( ActionOperateExTwo<NetPushClient,String> pushCallBack )
- {
- action = pushCallBack;
- return CreatePush( );
- }
-
-
-
- /**
- * 鍏抽棴娑堟伅鎺ㄩ�佺殑鐣岄潰
- */
- public void ClosePush()
- {
- action = null;
- if (CoreSocket != null && CoreSocket.isConnected()){
- Send(CoreSocket,Utilities.getBytes( 100 ) );
- }
- CloseSocket(CoreSocket);
- }
-
-
-
- /**
- * 鏈鎴风鐨勫叧閿瓧
- * @return
- */
- public String getKeyWord(){
- return keyWord;
- }
-
-
- private String ipAddress = ""; // IP鍦板潃
- private int port = 1000; // 绔彛鍙�
- private String keyWord = ""; // 缂撳瓨鐨勮闃呭叧閿瓧
- private ActionOperateExTwo<NetPushClient,String> action; // 鏈嶅姟鍣ㄦ帹閫佸悗鐨勫洖璋冩柟娉�
-
-
- /**
- * 鑾峰彇鏈璞＄殑瀛楃涓茶〃绀哄舰寮�
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return "NetPushClient";
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Enthernet/SimplifyNet/NetSimplifyClient.java b/src/main/java/com/zy/common/HslCommunication/Enthernet/SimplifyNet/NetSimplifyClient.java
deleted file mode 100644
index e40887d..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Enthernet/SimplifyNet/NetSimplifyClient.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.zy.common.HslCommunication.Enthernet.SimplifyNet;
-
-import com.zy.common.HslCommunication.Core.IMessage.HslMessage;
-import com.zy.common.HslCommunication.Core.Net.HslProtocol;
-import com.zy.common.HslCommunication.Core.Net.NetHandle;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDoubleBase;
-import com.zy.common.HslCommunication.Core.Transfer.RegularByteTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.util.UUID;
-
-
-/**
- * 鍚屾璁块棶鐨勭綉缁滃鎴风
- */
-public class NetSimplifyClient extends NetworkDoubleBase<HslMessage,RegularByteTransform>
-{
-
-
- /**
- * 瀹炰緥鍖栦竴涓鎴风鐨勫璞★紝鐢ㄤ簬鍜屾湇鍔″櫒閫氫俊
- * @param ipAddress Ip鍦板潃
- * @param port 绔彛鍙�
- */
- public NetSimplifyClient(String ipAddress, int port)
- {
- this.setIpAddress(ipAddress);
- this.setPort( port);
- }
-
- /**
- * 瀹炰緥鍖栦竴涓鎴风鐨勫璞★紝鐢ㄤ簬鍜屾湇鍔″櫒閫氫俊
- * @param ipAddress Ip鍦板潃
- * @param port 绔彛鍙�
- * @param token 浠ょ墝
- */
- public NetSimplifyClient(String ipAddress, int port, UUID token)
- {
- this.setIpAddress(ipAddress);
- this.setPort( port);
- this.Token = token;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓鎴风瀵硅薄锛岄渶瑕佹墜鍔ㄦ寚瀹欼p鍦板潃鍜岀鍙�
- */
- public NetSimplifyClient()
- {
-
- }
-
-
- /**
- * 瀹㈡埛绔悜鏈嶅姟鍣ㄨ繘琛岃姹傦紝璇锋眰瀛楃涓叉暟鎹�
- * @param customer 鐢ㄦ埛鐨勬寚浠ゅご
- * @param send 鍙戦�佹暟鎹�
- * @return 甯︾粨鏋滆鏄庣殑瀵硅薄
- */
- public OperateResultExOne<String> ReadFromServer(NetHandle customer, String send) {
- OperateResultExOne<String> result = new OperateResultExOne<String>();
- byte[] data = send.isEmpty() ? new byte[0] : Utilities.string2Byte(send);
- OperateResultExOne<byte[]> temp = ReadFromServerBase(HslProtocol.ProtocolUserString, customer.get_CodeValue(), data);
- result.IsSuccess = temp.IsSuccess;
- result.ErrorCode = temp.ErrorCode;
- result.Message = temp.Message;
- if (temp.IsSuccess) {
- result.Content = Utilities.byte2String(temp.Content);
- }
- temp = null;
- return result;
- }
-
-
- /**
- * 瀹㈡埛绔悜鏈嶅姟鍣ㄨ繘琛岃姹傦紝璇锋眰瀛楄妭鏁版嵁
- * @param customer 鐢ㄦ埛鐨勬寚浠ゅご
- * @param send 鍙戦�佺殑瀛楄妭鍐呭
- * @return 甯︾粨鏋滆鏄庣殑瀵硅薄
- */
- public OperateResultExOne<byte[]> ReadFromServer(NetHandle customer, byte[] send) {
- return ReadFromServerBase(HslProtocol.ProtocolUserBytes, customer.get_CodeValue(), send);
- }
-
-
- /**
- * 闇�瑕佸彂閫佺殑搴曞眰鏁版嵁
- * @param headCode 鏁版嵁鐨勬寚浠ゅご
- * @param customer 闇�瑕佸彂閫佺殑搴曞眰鏁版嵁
- * @param send 闇�瑕佸彂閫佺殑搴曞眰鏁版嵁
- * @return 甯︾粨鏋滆鏄庣殑瀵硅薄
- */
- private OperateResultExOne<byte[]> ReadFromServerBase(int headCode, int customer, byte[] send) {
- OperateResultExOne<byte[]> read = ReadFromCoreServer(HslProtocol.CommandBytes(headCode, customer, Token, send));
- if (!read.IsSuccess) {
- return read;
- }
-
- if(read.Content.length < HslProtocol.HeadByteLength){
- read.IsSuccess = false;
- read.Message = "length is not correct :" +read.Content.length;
- return read;
- }
-
- byte[] headBytes = new byte[HslProtocol.HeadByteLength];
- byte[] contentBytes = new byte[read.Content.length - HslProtocol.HeadByteLength];
-
- System.arraycopy(read.Content,0,headBytes,0,HslProtocol.HeadByteLength);
- if (contentBytes.length > 0) {
- System.arraycopy(read.Content, HslProtocol.HeadByteLength, contentBytes, 0, read.Content.length - HslProtocol.HeadByteLength);
- }
-
- contentBytes = HslProtocol.CommandAnalysis(headBytes, contentBytes);
- return OperateResultExOne.CreateSuccessResult(contentBytes);
- }
-
-
-
- /**
- * 鑾峰彇鏈璞＄殑瀛楃涓茶〃绀哄舰寮�
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString() {
- return "NetSimplifyClient";
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Language/DefaultLanguage.java b/src/main/java/com/zy/common/HslCommunication/Language/DefaultLanguage.java
deleted file mode 100644
index 7e61b52..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Language/DefaultLanguage.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package com.zy.common.HslCommunication.Language;
-
-/**
- * 绯荤粺鐨勮瑷�鍩虹被锛岄粯璁や篃鍗虫槸涓枃鐗堟湰
- */
-public class DefaultLanguage
-{
- /***********************************************************************************
- *
- * 涓�鑸殑閿欒淇℃伅
- *
- ************************************************************************************/
-
- public String ConnectedFailed (){ return "杩炴帴澶辫触锛�"; }
- public String UnknownError (){ return "鏈煡閿欒"; }
- public String ErrorCode (){ return "閿欒浠ｅ彿"; }
- public String TextDescription (){ return "鏂囨湰鎻忚堪"; }
- public String ExceptionMessage (){ return "閿欒淇℃伅锛�"; }
- public String ExceptionSourse (){ return "閿欒婧愶細"; }
- public String ExceptionType (){ return "閿欒绫诲瀷锛�"; }
- public String ExceptionStackTrace (){ return "閿欒鍫嗘爤锛�"; }
- public String ExceptopnTargetSite (){ return "閿欒鏂规硶锛�"; }
- public String ExceprionCustomer (){ return "鐢ㄦ埛鑷畾涔夋柟娉曞嚭閿欙細"; }
- public String SuccessText (){ return "鎴愬姛"; }
- public String TwoParametersLengthIsNotSame (){ return "涓や釜鍙傛暟鐨勪釜鏁颁笉涓�鑷�"; }
- public String NotSupportedDataType (){ return "杈撳叆鐨勭被鍨嬩笉鏀寔锛岃閲嶆柊杈撳叆"; }
- public String DataLengthIsNotEnough (){ return "鎺ユ敹鐨勬暟鎹暱搴︿笉瓒筹紝搴旇鍊�:{0},瀹為檯鍊�:{1}"; }
- public String ReceiveDataTimeout (){ return "鎺ユ敹鏁版嵁瓒呮椂锛�"; }
- public String ReceiveDataLengthTooShort (){ return "鎺ユ敹鐨勬暟鎹暱搴﹀お鐭細"; }
- public String MessageTip (){ return "娑堟伅鎻愮ず锛�"; }
- public String Close (){ return "鍏抽棴"; }
- public String Time (){ return "鏃堕棿锛�"; }
- public String SoftWare (){ return "杞欢锛�"; }
- public String BugSubmit (){ return "Bug鎻愪氦"; }
- public String MailServerCenter (){ return "閭欢鍙戦�佺郴缁�"; }
- public String MailSendTail (){ return "閭欢鏈嶅姟绯荤粺鑷姩鍙戝嚭锛岃鍕垮洖澶嶏紒"; }
- public String IpAddresError (){ return "Ip鍦板潃杈撳叆寮傚父锛屾牸寮忎笉姝ｇ‘"; }
- public String Send (){ return "鍙戦��";}
- public String Receive(){ return "鎺ユ敹";}
-
- /***********************************************************************************
- *
- * 绯荤粺鐩稿叧鐨勯敊璇俊鎭�
- *
- ************************************************************************************/
-
- public String SystemInstallOperater (){ return "瀹夎鏂扮郴缁燂細IP涓�"; }
- public String SystemUpdateOperater (){ return "鏇存柊鏂扮郴缁燂細IP涓�"; }
-
-
- /***********************************************************************************
- *
- * 濂楁帴瀛楃浉鍏崇殑淇℃伅鎻忚堪
- *
- ************************************************************************************/
-
- public String SocketIOException (){ return "濂楁帴瀛椾紶閫佹暟鎹紓甯革細"; }
- public String SocketSendException (){ return "鍚屾鏁版嵁鍙戦�佸紓甯革細"; }
- public String SocketHeadReceiveException (){ return "鎸囦护澶存帴鏀跺紓甯革細"; }
- public String SocketContentReceiveException (){ return "鍐呭鏁版嵁鎺ユ敹寮傚父锛�"; }
- public String SocketContentRemoteReceiveException (){ return "瀵规柟鍐呭鏁版嵁鎺ユ敹寮傚父锛�"; }
- public String SocketAcceptCallbackException (){ return "寮傛鎺ュ彈浼犲叆鐨勮繛鎺ュ皾璇�"; }
- public String SocketReAcceptCallbackException (){ return "閲嶆柊寮傛鎺ュ彈浼犲叆鐨勮繛鎺ュ皾璇�"; }
- public String SocketSendAsyncException (){ return "寮傛鏁版嵁鍙戦�佸嚭閿�:"; }
- public String SocketEndSendException (){ return "寮傛鏁版嵁缁撴潫鎸傝捣鍙戦�佸嚭閿�"; }
- public String SocketReceiveException (){ return "寮傛鏁版嵁鍙戦�佸嚭閿�:"; }
- public String SocketEndReceiveException (){ return "寮傛鏁版嵁缁撴潫鎺ユ敹鎸囦护澶村嚭閿�"; }
- public String SocketRemoteCloseException (){ return "杩滅▼涓绘満寮鸿揩鍏抽棴浜嗕竴涓幇鏈夌殑杩炴帴"; }
-
-
- /***********************************************************************************
- *
- * 鏂囦欢鐩稿叧鐨勪俊鎭�
- *
- ************************************************************************************/
-
-
- public String FileDownloadSuccess (){ return "鏂囦欢涓嬭浇鎴愬姛"; }
- public String FileDownloadFailed (){ return "鏂囦欢涓嬭浇寮傚父"; }
- public String FileUploadFailed (){ return "鏂囦欢涓婁紶寮傚父"; }
- public String FileUploadSuccess (){ return "鏂囦欢涓婁紶鎴愬姛"; }
- public String FileDeleteFailed (){ return "鏂囦欢鍒犻櫎寮傚父"; }
- public String FileDeleteSuccess (){ return "鏂囦欢鍒犻櫎鎴愬姛"; }
- public String FileReceiveFailed (){ return "纭鏂囦欢鎺ユ敹寮傚父"; }
- public String FileNotExist (){ return "鏂囦欢涓嶅瓨鍦�"; }
- public String FileSaveFailed (){ return "鏂囦欢瀛樺偍澶辫触"; }
- public String FileLoadFailed (){ return "鏂囦欢鍔犺浇澶辫触"; }
- public String FileSendClientFailed (){ return "鏂囦欢鍙戦�佺殑鏃跺�欏彂鐢熶簡寮傚父"; }
- public String FileWriteToNetFailed (){ return "鏂囦欢鍐欏叆缃戠粶寮傚父"; }
- public String FileReadFromNetFailed (){ return "浠庣綉缁滆鍙栨枃浠跺紓甯�"; }
- public String FilePathCreateFailed (){ return "鏂囦欢澶硅矾寰勫垱寤哄け璐ワ細"; }
- public String FileRemoteNotExist (){ return "瀵规柟鏂囦欢涓嶅瓨鍦紝鏃犳硶鎺ユ敹锛�"; }
-
- /***********************************************************************************
- *
- * 鏈嶅姟鍣ㄧ殑寮曟搸鐩稿叧鏁版嵁
- *
- ************************************************************************************/
-
- public String TokenCheckFailed (){ return "鎺ユ敹楠岃瘉浠ょ墝涓嶄竴鑷�"; }
- public String TokenCheckTimeout (){ return "鎺ユ敹楠岃瘉瓒呮椂:"; }
- public String CommandHeadCodeCheckFailed (){ return "鍛戒护澶存牎楠屽け璐�"; }
- public String CommandLengthCheckFailed (){ return "鍛戒护闀垮害妫�鏌ュけ璐�"; }
- public String NetClientAliasFailed (){ return "瀹㈡埛绔殑鍒悕鎺ユ敹澶辫触锛�"; }
- public String NetEngineStart (){ return "鍚姩寮曟搸"; }
- public String NetEngineClose (){ return "鍏抽棴寮曟搸"; }
- public String NetClientOnline (){ return "涓婄嚎"; }
- public String NetClientOffline (){ return "涓嬬嚎"; }
- public String NetClientBreak (){ return "寮傚父鎺夌嚎"; }
- public String NetClientFull (){ return "鏈嶅姟鍣ㄦ壙杞戒笂闄愶紝鏀跺埌瓒呭嚭鐨勮姹傝繛鎺ャ��"; }
- public String NetClientLoginFailed (){ return "瀹㈡埛绔櫥褰曚腑閿欒锛�"; }
- public String NetHeartCheckFailed (){ return "蹇冭烦楠岃瘉寮傚父锛�"; }
- public String NetHeartCheckTimeout (){ return "蹇冭烦楠岃瘉瓒呮椂锛屽己鍒朵笅绾匡細"; }
- public String DataSourseFormatError (){ return "鏁版嵁婧愭牸寮忎笉姝ｇ‘"; }
- public String ServerFileCheckFailed (){ return "鏈嶅姟鍣ㄧ‘璁ゆ枃浠跺け璐ワ紝璇烽噸鏂颁笂浼�"; }
- public String ClientOnlineInfo (){ return "瀹㈡埛绔� [ {0} ] 涓婄嚎"; }
- public String ClientOfflineInfo (){ return "瀹㈡埛绔� [ {0} ] 涓嬬嚎"; }
- public String ClientDisableLogin (){ return "瀹㈡埛绔� [ {0} ] 涓嶈淇′换锛岀姝㈢櫥褰�"; }
-
- /***********************************************************************************
- *
- * Client 鐩稿叧
- *
- ************************************************************************************/
-
- public String ReConnectServerSuccess (){ return "閲嶈繛鏈嶅姟鍣ㄦ垚鍔�"; }
- public String ReConnectServerAfterTenSeconds (){ return "鍦�10绉掑悗閲嶆柊杩炴帴鏈嶅姟鍣�"; }
- public String KeyIsNotAllowedNull (){ return "鍏抽敭瀛椾笉鍏佽涓虹┖"; }
- public String KeyIsExistAlready (){ return "褰撳墠鐨勫叧閿瓧宸茬粡瀛樺湪"; }
- public String KeyIsNotExist (){ return "褰撳墠璁㈤槄鐨勫叧閿瓧涓嶅瓨鍦�"; }
- public String ConnectingServer (){ return "姝ｅ湪杩炴帴鏈嶅姟鍣�..."; }
- public String ConnectFailedAndWait (){ return "杩炴帴鏂紑锛岀瓑寰厈0}绉掑悗閲嶆柊杩炴帴"; }
- public String AttemptConnectServer (){ return "姝ｅ湪灏濊瘯绗瑊0}娆¤繛鎺ユ湇鍔″櫒"; }
- public String ConnectServerSuccess (){ return "杩炴帴鏈嶅姟鍣ㄦ垚鍔�"; }
- public String GetClientIpaddressFailed (){ return "瀹㈡埛绔疘P鍦板潃鑾峰彇澶辫触"; }
- public String ConnectionIsNotAvailable (){ return "褰撳墠鐨勮繛鎺ヤ笉鍙敤"; }
- public String DeviceCurrentIsLoginRepeat (){ return "褰撳墠璁惧鐨刬d閲嶅鐧诲綍"; }
- public String DeviceCurrentIsLoginForbidden (){ return "褰撳墠璁惧鐨刬d绂佹鐧诲綍"; }
- public String PasswordCheckFailed (){ return "瀵嗙爜楠岃瘉澶辫触"; }
- public String DataTransformError (){ return "鏁版嵁杞崲澶辫触锛屾簮鏁版嵁锛�"; }
- public String RemoteClosedConnection (){ return "杩滅▼鍏抽棴浜嗚繛鎺�"; }
-
- /***********************************************************************************
- *
- * 鏃ュ織 鐩稿叧
- *
- ************************************************************************************/
- public String LogNetDebug (){ return "璋冭瘯"; }
- public String LogNetInfo (){ return "淇℃伅"; }
- public String LogNetWarn (){ return "璀﹀憡"; }
- public String LogNetError (){ return "閿欒"; }
- public String LogNetFatal (){ return "鑷村懡"; }
- public String LogNetAbandon (){ return "鏀惧純"; }
- public String LogNetAll (){ return "鍏ㄩ儴"; }
-
- /***********************************************************************************
- *
- * Modbus鐩稿叧
- *
- ************************************************************************************/
-
- public String ModbusTcpFunctionCodeNotSupport (){ return "涓嶆敮鎸佺殑鍔熻兘鐮�"; }
- public String ModbusTcpFunctionCodeOverBound (){ return "璇诲彇鐨勬暟鎹秺鐣�"; }
- public String ModbusTcpFunctionCodeQuantityOver (){ return "璇诲彇闀垮害瓒呰繃鏈�澶у��"; }
- public String ModbusTcpFunctionCodeReadWriteException (){ return "璇诲啓寮傚父"; }
- public String ModbusTcpReadCoilException (){ return "璇诲彇绾垮湀寮傚父"; }
- public String ModbusTcpWriteCoilException (){ return "鍐欏叆绾垮湀寮傚父"; }
- public String ModbusTcpReadRegisterException (){ return "璇诲彇瀵勫瓨鍣ㄥ紓甯�"; }
- public String ModbusTcpWriteRegisterException (){ return "鍐欏叆瀵勫瓨鍣ㄥ紓甯�"; }
- public String ModbusAddressMustMoreThanOne (){ return "鍦板潃鍊煎湪璧峰鍦板潃涓�1鐨勬儏鍐典笅锛屽繀椤诲ぇ浜�1"; }
- public String ModbusAsciiFormatCheckFailed (){ return "Modbus鐨刟scii鎸囦护妫�鏌ュけ璐ワ紝涓嶆槸modbus-ascii鎶ユ枃"; }
- public String ModbusCRCCheckFailed (){ return "Modbus鐨凜RC鏍￠獙妫�鏌ュけ璐�"; }
- public String ModbusLRCCheckFailed (){ return "Modbus鐨凩RC鏍￠獙妫�鏌ュけ璐�"; }
- public String ModbusMatchFailed (){ return "涓嶆槸鏍囧噯鐨刴odbus鍗忚"; }
-
-
- /***********************************************************************************
- *
- * Melsec PLC 鐩稿叧
- *
- ************************************************************************************/
- public String MelsecPleaseReferToManulDocument (){ return "璇锋煡鐪嬩笁鑿辩殑閫氳鎵嬪唽鏉ユ煡鐪嬫姤璀︾殑鍏蜂綋淇℃伅"; }
- public String MelsecReadBitInfo (){ return "璇诲彇浣嶅彉閲忔暟缁勫彧鑳介拡瀵逛綅杞厓浠讹紝濡傛灉璇诲彇瀛楄蒋鍏冧欢锛岃璋冪敤Read鏂规硶"; }
- public String MelsecCurrentTypeNotSupportedWordOperate (){ return "褰撳墠鐨勭被鍨嬩笉鏀寔瀛楄鍐�"; }
- public String MelsecCurrentTypeNotSupportedBitOperate (){ return "褰撳墠鐨勭被鍨嬩笉鏀寔浣嶈鍐�"; }
- public String MelsecFxReceiveZore (){ return "鎺ユ敹鐨勬暟鎹暱搴︿负0"; }
- public String MelsecFxAckNagative (){ return "PLC鍙嶉鐨勬暟鎹棤鏁�"; }
- public String MelsecFxAckWrong (){ return "PLC鍙嶉淇″彿閿欒锛�"; }
- public String MelsecFxCrcCheckFailed (){ return "PLC鍙嶉鎶ユ枃鐨勫拰鏍￠獙澶辫触锛�"; }
-
- /***********************************************************************************
- *
- * Siemens PLC 鐩稿叧
- *
- ************************************************************************************/
-
- public String SiemensDBAddressNotAllowedLargerThan255 (){ return "DB鍧楁暟鎹棤娉曞ぇ浜�255"; }
- public String SiemensReadLengthMustBeEvenNumber (){ return "璇诲彇鐨勬暟鎹暱搴﹀繀椤讳负鍋舵暟"; }
- public String SiemensWriteError (){ return "鍐欏叆鏁版嵁寮傚父锛屼唬鍙蜂负锛�"; }
- public String SiemensReadLengthCannotLargerThan19 (){ return "璇诲彇鐨勬暟缁勬暟閲忎笉鍏佽澶т簬19"; }
- public String SiemensDataLengthCheckFailed (){ return "鏁版嵁鍧楅暱搴︽牎楠屽け璐ワ紝璇锋鏌ユ槸鍚﹀紑鍚痯ut/get浠ュ強鍏抽棴db鍧椾紭鍖�"; }
- public String SiemensFWError (){ return "鍙戠敓浜嗗紓甯革紝鍏蜂綋淇℃伅鏌ユ壘Fetch/Write鍗忚鏂囨。"; }
-
- /***********************************************************************************
- *
- * Omron PLC 鐩稿叧
- *
- ************************************************************************************/
-
- public String OmronAddressMustBeZeroToFiveteen (){ return "杈撳叆鐨勪綅鍦板潃鍙兘鍦�0-15涔嬮棿"; }
- public String OmronReceiveDataError (){ return "鏁版嵁鎺ユ敹寮傚父"; }
- public String OmronStatus0 (){ return "閫氳姝ｅ父"; }
- public String OmronStatus1 (){ return "娑堟伅澶翠笉鏄疐INS"; }
- public String OmronStatus2 (){ return "鏁版嵁闀垮害澶暱"; }
- public String OmronStatus3 (){ return "璇ュ懡浠や笉鏀寔"; }
- public String OmronStatus20 (){ return "瓒呰繃杩炴帴涓婇檺"; }
- public String OmronStatus21 (){ return "鎸囧畾鐨勮妭鐐瑰凡缁忓浜庤繛鎺ヤ腑"; }
- public String OmronStatus22 (){ return "灏濊瘯鍘昏繛鎺ヤ竴涓彈淇濇姢鐨勭綉缁滆妭鐐癸紝璇ヨ妭鐐硅繕鏈厤缃埌PLC涓�"; }
- public String OmronStatus23 (){ return "褰撳墠瀹㈡埛绔殑缃戠粶鑺傜偣瓒呰繃姝ｅ父鑼冨洿"; }
- public String OmronStatus24 (){ return "褰撳墠瀹㈡埛绔殑缃戠粶鑺傜偣宸茬粡琚娇鐢�"; }
- public String OmronStatus25 (){ return "鎵�鏈夌殑缃戠粶鑺傜偣宸茬粡琚娇鐢�"; }
-
-
-
- /***********************************************************************************
- *
- * AB PLC 鐩稿叧
- *
- ************************************************************************************/
-
-
- public String AllenBradley04 (){ return "瀹冩病鏈夋纭敓鎴愭垨鍖归厤鏍囪涓嶅瓨鍦ㄣ��"; }
- public String AllenBradley05 (){ return "寮曠敤鐨勭壒瀹氶」锛堥�氬父鏄疄渚嬶級鏃犳硶鎵惧埌銆�"; }
- public String AllenBradley06 (){ return "璇锋眰鐨勬暟鎹噺涓嶉�傚悎鍝嶅簲缂撳啿鍖恒�� 鍙戠敓浜嗛儴鍒嗘暟鎹紶杈撱��"; }
- public String AllenBradley0A (){ return "灏濊瘯澶勭悊鍏朵腑涓�涓睘鎬ф椂鍙戠敓閿欒銆�"; }
- public String AllenBradley13 (){ return "鍛戒护涓病鏈夋彁渚涜冻澶熺殑鍛戒护鏁版嵁/鍙傛暟鏉ユ墽琛屾墍璇锋眰鐨勬湇鍔°��"; }
- public String AllenBradley1C (){ return "涓庡睘鎬ц鏁扮浉姣旓紝鎻愪緵鐨勫睘鎬ф暟閲忎笉瓒炽��"; }
- public String AllenBradley1E (){ return "姝ゆ湇鍔′腑鐨勬湇鍔¤姹傚嚭閿欍��"; }
- public String AllenBradley26 (){ return "IOI瀛楅暱涓庡鐞嗙殑IOI鏁伴噺涓嶅尮閰嶃��"; }
-
- public String AllenBradleySessionStatus00 (){ return "鎴愬姛"; }
- public String AllenBradleySessionStatus01 (){ return "鍙戜欢浜哄彂鍑烘棤鏁堟垨涓嶅彈鏀寔鐨勫皝瑁呭懡浠ゃ��"; }
- public String AllenBradleySessionStatus02 (){ return "鎺ユ敹鍣ㄤ腑鐨勫唴瀛樿祫婧愪笉瓒充互澶勭悊鍛戒护銆� 杩欎笉鏄竴涓簲鐢ㄧ▼搴忛敊璇�� 鐩稿弽锛屽彧鏈夊湪灏佽灞傛棤娉曡幏寰楁墍闇�鍐呭瓨璧勬簮鐨勬儏鍐典笅鎵嶄細瀵艰嚧姝ら棶棰樸��"; }
- public String AllenBradleySessionStatus03 (){ return "灏佽娑堟伅鐨勬暟鎹儴鍒嗕腑鐨勬暟鎹舰鎴愪笉鑹垨涓嶆纭��"; }
- public String AllenBradleySessionStatus64 (){ return "鍚戠洰鏍囧彂閫佸皝瑁呮秷鎭椂锛屽鍙戣�呬娇鐢ㄤ簡鏃犳晥鐨勪細璇濆彞鏌勩��"; }
- public String AllenBradleySessionStatus65 (){ return "鐩爣鏀跺埌涓�涓棤鏁堥暱搴︾殑淇℃伅銆�"; }
- public String AllenBradleySessionStatus69 (){ return "涓嶆敮鎸佺殑灏佽鍗忚淇銆�"; }
-
- /***********************************************************************************
- *
- * Panasonic PLC 鐩稿叧
- *
- ************************************************************************************/
- public String PanasonicReceiveLengthMustLargerThan9 (){ return "鎺ユ敹鏁版嵁闀垮害蹇呴』澶т簬9"; }
- public String PanasonicAddressParameterCannotBeNull (){ return "鍦板潃鍙傛暟涓嶅厑璁镐负绌�"; }
- public String PanasonicMewStatus20 (){ return "閿欒鏈煡"; }
- public String PanasonicMewStatus21 (){ return "NACK閿欒锛岃繙绋嬪崟鍏冩棤娉曡姝ｇ‘璇嗗埆锛屾垨鑰呭彂鐢熶簡鏁版嵁閿欒銆�"; }
- public String PanasonicMewStatus22 (){ return "WACK 閿欒:鐢ㄤ簬杩滅▼鍗曞厓鐨勬帴鏀剁紦鍐插尯宸叉弧銆�"; }
- public String PanasonicMewStatus23 (){ return "澶氶噸绔彛閿欒:杩滅▼鍗曞厓缂栧彿(01 鑷� 16)璁剧疆涓庢湰鍦板崟鍏冮噸澶嶃��"; }
- public String PanasonicMewStatus24 (){ return "浼犺緭鏍煎紡閿欒:璇曞浘鍙戦�佷笉绗﹀悎浼犺緭鏍煎紡鐨勬暟鎹紝鎴栬�呮煇涓�甯ф暟鎹孩鍑烘垨鍙戠敓浜嗘暟鎹敊璇��"; }
- public String PanasonicMewStatus25 (){ return "纭欢閿欒:浼犺緭绯荤粺纭欢鍋滄鎿嶄綔銆�"; }
- public String PanasonicMewStatus26 (){ return "鍗曞厓鍙烽敊璇�:杩滅▼鍗曞厓鐨勭紪鍙疯缃秴鍑� 01 鑷� 63 鐨勮寖鍥淬��"; }
- public String PanasonicMewStatus27 (){ return "涓嶆敮鎸侀敊璇�:鎺ユ敹鏂规暟鎹抚婧㈠嚭. 璇曞浘鍦ㄤ笉鍚岀殑妯″潡涔嬮棿鍙戦�佷笉鍚屽抚闀垮害鐨勬暟鎹��"; }
- public String PanasonicMewStatus28 (){ return "鏃犲簲绛旈敊璇�:杩滅▼鍗曞厓涓嶅瓨鍦�. (瓒呮椂)銆�"; }
- public String PanasonicMewStatus29 (){ return "缂撳啿鍖哄叧闂敊璇�:璇曞浘鍙戦�佹垨鎺ユ敹澶勪簬鍏抽棴鐘舵�佺殑缂撳啿鍖恒��"; }
- public String PanasonicMewStatus30 (){ return "瓒呮椂閿欒:鎸佺画澶勪簬浼犺緭绂佹鐘舵�併��"; }
- public String PanasonicMewStatus40 (){ return "BCC 閿欒:鍦ㄦ寚浠ゆ暟鎹腑鍙戠敓浼犺緭閿欒銆�"; }
- public String PanasonicMewStatus41 (){ return "鏍煎紡閿欒:鎵�鍙戦�佺殑鎸囦护淇℃伅涓嶇鍚堜紶杈撴牸寮忋��"; }
- public String PanasonicMewStatus42 (){ return "涓嶆敮鎸侀敊璇�:鍙戦�佷簡涓�涓湭琚敮鎸佺殑鎸囦护銆傚悜鏈鏀寔鐨勭洰鏍囩珯鍙戦�佷簡鎸囦护銆�"; }
- public String PanasonicMewStatus43 (){ return "澶勭悊姝ラ閿欒:鍦ㄥ浜庝紶杈撹姹備俊鎭寕璧锋椂,鍙戦�佷簡鍏朵粬鎸囦护銆�"; }
- public String PanasonicMewStatus50 (){ return "閾炬帴璁剧疆閿欒:璁剧疆浜嗗疄闄呬笉瀛樺湪鐨勯摼鎺ョ紪鍙枫��"; }
- public String PanasonicMewStatus51 (){ return "鍚屾椂鎿嶄綔閿欒:褰撳悜鍏朵粬鍗曞厓鍙戝嚭鎸囦护鏃�,鏈湴鍗曞厓鐨勪紶杈撶紦鍐插尯宸叉弧銆�"; }
- public String PanasonicMewStatus52 (){ return "浼犺緭绂佹閿欒:鏃犳硶鍚戝叾浠栧崟鍏冧紶杈撱��"; }
- public String PanasonicMewStatus53 (){ return "蹇欓敊璇�:鍦ㄦ帴鏀跺埌鎸囦护鏃�,姝ｅ湪澶勭悊鍏朵粬鎸囦护銆�"; }
- public String PanasonicMewStatus60 (){ return "鍙傛暟閿欒:鍦ㄦ寚浠や腑鍖呭惈鏈夋棤娉曚娇鐢ㄧ殑浠ｇ爜,鎴栬�呬唬鐮佹病鏈夐檮甯﹀尯鍩熸寚瀹氬弬鏁�(X, Y, D), 绛変互澶栥��"; }
- public String PanasonicMewStatus61 (){ return "鏁版嵁閿欒:瑙︾偣缂栧彿,鍖哄煙缂栧彿,鏁版嵁浠ｇ爜鏍煎紡(BCD,hex,绛�)涓婃孩鍑�, 涓嬫孩鍑轰互鍙婂尯鍩熸寚瀹氶敊璇��"; }
- public String PanasonicMewStatus62 (){ return "瀵勫瓨鍣ㄩ敊璇�:杩囧璁板綍鏁版嵁鍦ㄦ湭璁板綍鐘舵�佷笅鐨勬搷浣滐紙鐩戞帶璁板綍銆佽窡韪褰曠瓑銆�)銆�"; }
- public String PanasonicMewStatus63 (){ return "PLC 妯″紡閿欒:褰撲竴鏉℃寚浠ゅ彂鍑烘椂锛岃繍琛屾ā寮忎笉鑳藉瀵规寚浠よ繘琛屽鐞嗐��"; }
- public String PanasonicMewStatus65 (){ return "淇濇姢閿欒:鍦ㄥ瓨鍌ㄤ繚鎶ょ姸鎬佷笅鎵ц鍐欐搷浣滃埌绋嬪簭鍖哄煙鎴栫郴缁熷瘎瀛樺櫒銆�"; }
- public String PanasonicMewStatus66 (){ return "鍦板潃閿欒:鍦板潃锛堢▼搴忓湴鍧�銆佺粷瀵瑰湴鍧�绛夛級鏁版嵁缂栫爜褰㈠紡锛圔CD銆乭ex 绛夛級銆佷笂婧€�佷笅婧㈡垨鎸囧畾鑼冨洿閿欒銆�"; }
- public String PanasonicMewStatus67 (){ return "涓㈠け鏁版嵁閿欒:瑕佽鐨勬暟鎹笉瀛樺湪銆傦紙璇诲彇娌℃湁鍐欏叆娉ㄩ噴瀵勫瓨鍖虹殑鏁版嵁銆傘��"; }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Language/English.java b/src/main/java/com/zy/common/HslCommunication/Language/English.java
deleted file mode 100644
index 4f40d6a..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Language/English.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package com.zy.common.HslCommunication.Language;
-
-/**
- * English Version Text
- */
-public class English extends DefaultLanguage {
-
- /***********************************************************************************
- *
- * Normal Info
- *
- ************************************************************************************/
-
- @Override
- public String ConnectedFailed (){ return "Connected Failed: "; }
- @Override
- public String UnknownError (){ return "Unknown Error"; }
- @Override
- public String ErrorCode (){ return "Error Code: "; }
- @Override
- public String TextDescription (){ return "Description: "; }
- @Override
- public String ExceptionMessage (){ return "Exception Info: "; }
- @Override
- public String ExceptionSourse (){ return "Exception Sourse锛�"; }
- @Override
- public String ExceptionType (){ return "Exception Type锛�"; }
- @Override
- public String ExceptionStackTrace (){ return "Exception Stack: "; }
- @Override
- public String ExceptopnTargetSite (){ return "Exception Method: "; }
- @Override
- public String ExceprionCustomer (){ return "Error in user-defined method: "; }
- @Override
- public String SuccessText (){ return "Success"; }
- @Override
- public String TwoParametersLengthIsNotSame (){ return "Two Parameter Length is not same"; }
- @Override
- public String NotSupportedDataType (){ return "Unsupported DataType, input again"; }
- @Override
- public String DataLengthIsNotEnough (){ return "Receive length is not enough锛孲hould:{0},Actual:{1}"; }
- @Override
- public String ReceiveDataTimeout (){ return "Receive timeout: "; }
- @Override
- public String ReceiveDataLengthTooShort (){ return "Receive length is too short: "; }
- @Override
- public String MessageTip (){ return "Message prompt:"; }
- @Override
- public String Close (){ return "Close"; }
- @Override
- public String Time (){ return "Time:"; }
- @Override
- public String SoftWare (){ return "Software:"; }
- @Override
- public String BugSubmit (){ return "Bug submit"; }
- @Override
- public String MailServerCenter (){ return "Mail Center System"; }
- @Override
- public String MailSendTail (){ return "Mail Service system issued automatically, do not reply"; }
- @Override
- public String IpAddresError (){ return "IP address input exception, format is incorrect"; }
- @Override
- public String Send (){ return "Send";}
- @Override
- public String Receive(){ return "Receive";}
-
- /***********************************************************************************
- *
- * System about
- *
- ************************************************************************************/
-
- @Override
- public String SystemInstallOperater (){ return "Install new software: ip address is"; }
- @Override
- public String SystemUpdateOperater (){ return "Update software: ip address is"; }
-
-
- /***********************************************************************************
- *
- * Socket-related Information description
- *
- ************************************************************************************/
-
- @Override
- public String SocketIOException (){ return "Socket transport error: "; }
- @Override
- public String SocketSendException (){ return "Synchronous Data Send exception: "; }
- @Override
- public String SocketHeadReceiveException (){ return "Command header receive exception: "; }
- @Override
- public String SocketContentReceiveException (){ return "Content Data Receive exception: "; }
- @Override
- public String SocketContentRemoteReceiveException (){ return "Recipient content Data Receive exception: "; }
- @Override
- public String SocketAcceptCallbackException (){ return "Asynchronously accepts an incoming connection attempt: "; }
- @Override
- public String SocketReAcceptCallbackException (){ return "To re-accept incoming connection attempts asynchronously"; }
- @Override
- public String SocketSendAsyncException (){ return "Asynchronous Data send Error: "; }
- @Override
- public String SocketEndSendException (){ return "Asynchronous data end callback send Error"; }
- @Override
- public String SocketReceiveException (){ return "Asynchronous Data send Error: "; }
- @Override
- public String SocketEndReceiveException (){ return "Asynchronous data end receive instruction header error"; }
- @Override
- public String SocketRemoteCloseException (){ return "An existing connection was forcibly closed by the remote host"; }
-
-
- /***********************************************************************************
- *
- * File related information
- *
- ************************************************************************************/
-
-
- @Override
- public String FileDownloadSuccess (){ return "File Download Successful"; }
- @Override
- public String FileDownloadFailed (){ return "File Download exception"; }
- @Override
- public String FileUploadFailed (){ return "File Upload exception"; }
- @Override
- public String FileUploadSuccess (){ return "File Upload Successful"; }
- @Override
- public String FileDeleteFailed (){ return "File Delete exception"; }
- @Override
- public String FileDeleteSuccess (){ return "File deletion succeeded"; }
- @Override
- public String FileReceiveFailed (){ return "Confirm File Receive exception"; }
- @Override
- public String FileNotExist (){ return "File does not exist"; }
- @Override
- public String FileSaveFailed (){ return "File Store failed"; }
- @Override
- public String FileLoadFailed (){ return "File load failed"; }
- @Override
- public String FileSendClientFailed (){ return "An exception occurred when the file was sent"; }
- @Override
- public String FileWriteToNetFailed (){ return "File Write Network exception"; }
- @Override
- public String FileReadFromNetFailed (){ return "Read file exceptions from the network"; }
- @Override
- public String FilePathCreateFailed (){ return "Folder path creation failed: "; }
- @Override
- public String FileRemoteNotExist (){ return "The other file does not exist, cannot receive!"; }
-
- /***********************************************************************************
- *
- * Engine-related data for the server
- *
- ************************************************************************************/
-
- @Override
- public String TokenCheckFailed (){ return "Receive authentication token inconsistency"; }
- @Override
- public String TokenCheckTimeout (){ return "Receive authentication timeout: "; }
- @Override
- public String CommandHeadCodeCheckFailed (){ return "Command header check failed"; }
- @Override
- public String CommandLengthCheckFailed (){ return "Command length check failed"; }
- @Override
- public String NetClientAliasFailed (){ return "Client's alias receive failed: "; }
- @Override
- public String NetEngineStart (){ return "Start engine"; }
- @Override
- public String NetEngineClose (){ return "Shutting down the engine"; }
- @Override
- public String NetClientOnline (){ return "Online"; }
- @Override
- public String NetClientOffline (){ return "Offline"; }
- @Override
- public String NetClientBreak (){ return "Abnormal offline"; }
- @Override
- public String NetClientFull (){ return "The server hosts the upper limit and receives an exceeded request connection."; }
- @Override
- public String NetClientLoginFailed (){ return "Error in Client logon: "; }
- @Override
- public String NetHeartCheckFailed (){ return "Heartbeat Validation exception: "; }
- @Override
- public String NetHeartCheckTimeout (){ return "Heartbeat verification timeout, force offline: "; }
- @Override
- public String DataSourseFormatError (){ return "Data source format is incorrect"; }
- @Override
- public String ServerFileCheckFailed (){ return "Server confirmed file failed, please re-upload"; }
- @Override
- public String ClientOnlineInfo (){ return "Client [ {0} ] Online"; }
- @Override
- public String ClientOfflineInfo (){ return "Client [ {0} ] Offline"; }
- @Override
- public String ClientDisableLogin (){ return "Client [ {0} ] is not trusted, login forbidden"; }
-
- /***********************************************************************************
- *
- * Client related
- *
- ************************************************************************************/
-
- @Override
- public String ReConnectServerSuccess (){ return "Re-connect server succeeded"; }
- @Override
- public String ReConnectServerAfterTenSeconds (){ return "Reconnect the server after 10 seconds"; }
- @Override
- public String KeyIsNotAllowedNull (){ return "The keyword is not allowed to be empty"; }
- @Override
- public String KeyIsExistAlready (){ return "The current keyword already exists"; }
- @Override
- public String KeyIsNotExist (){ return "The keyword for the current subscription does not exist"; }
- @Override
- public String ConnectingServer (){ return "Connecting to Server..."; }
- @Override
- public String ConnectFailedAndWait (){ return "Connection disconnected, wait {0} seconds to reconnect"; }
- @Override
- public String AttemptConnectServer (){ return "Attempting to connect server {0} times"; }
- @Override
- public String ConnectServerSuccess (){ return "Connection Server succeeded"; }
- @Override
- public String GetClientIpaddressFailed (){ return "Client IP Address acquisition failed"; }
- @Override
- public String ConnectionIsNotAvailable (){ return "The current connection is not available"; }
- @Override
- public String DeviceCurrentIsLoginRepeat (){ return "ID of the current device duplicate login"; }
- @Override
- public String DeviceCurrentIsLoginForbidden (){ return "The ID of the current device prohibits login"; }
- @Override
- public String PasswordCheckFailed (){ return "Password validation failed"; }
- @Override
- public String DataTransformError (){ return "Data conversion failed, source data: "; }
- @Override
- public String RemoteClosedConnection (){ return "Remote shutdown of connection"; }
-
- /***********************************************************************************
- *
- * Log related
- *
- ************************************************************************************/
- @Override
- public String LogNetDebug (){ return "Debug"; }
- @Override
- public String LogNetInfo (){ return "Info"; }
- @Override
- public String LogNetWarn (){ return "Warn"; }
- @Override
- public String LogNetError (){ return "Error"; }
- @Override
- public String LogNetFatal (){ return "Fatal"; }
- @Override
- public String LogNetAbandon (){ return "Abandon"; }
- @Override
- public String LogNetAll (){ return "All"; }
-
-
- /***********************************************************************************
- *
- * Modbus related
- *
- ************************************************************************************/
-
- @Override
- public String ModbusTcpFunctionCodeNotSupport (){ return "Unsupported function code"; }
- @Override
- public String ModbusTcpFunctionCodeOverBound (){ return "Data read out of bounds"; }
- @Override
- public String ModbusTcpFunctionCodeQuantityOver (){ return "Read length exceeds maximum value"; }
- @Override
- public String ModbusTcpFunctionCodeReadWriteException (){ return "Read and Write exceptions"; }
- @Override
- public String ModbusTcpReadCoilException (){ return "Read Coil anomalies"; }
- @Override
- public String ModbusTcpWriteCoilException (){ return "Write Coil exception"; }
- @Override
- public String ModbusTcpReadRegisterException (){ return "Read Register exception"; }
- @Override
- public String ModbusTcpWriteRegisterException (){ return "Write Register exception"; }
- @Override
- public String ModbusAddressMustMoreThanOne (){ return "The address value must be greater than 1 in the case where the start address is 1"; }
- @Override
- public String ModbusAsciiFormatCheckFailed (){ return "Modbus ASCII command check failed, not MODBUS-ASCII message"; }
- @Override
- public String ModbusCRCCheckFailed (){ return "The CRC checksum check failed for Modbus"; }
- @Override
- public String ModbusLRCCheckFailed (){ return "The LRC checksum check failed for Modbus"; }
- @Override
- public String ModbusMatchFailed (){ return "Not the standard Modbus protocol"; }
-
-
- /***********************************************************************************
- *
- * Melsec PLC related
- *
- ************************************************************************************/
- @Override
- public String MelsecPleaseReferToManulDocument (){ return "Please check Mitsubishi's communication manual for details of the alarm."; }
- @Override
- public String MelsecReadBitInfo (){ return "The read bit variable array can only be used for bit soft elements, if you read the word soft component, call the Read method"; }
- @Override
- public String MelsecCurrentTypeNotSupportedWordOperate (){ return "The current type does not support word read and write"; }
- @Override
- public String MelsecCurrentTypeNotSupportedBitOperate (){ return "The current type does not support bit read and write"; }
- @Override
- public String MelsecFxReceiveZore (){ return "The received data length is 0"; }
- @Override
- public String MelsecFxAckNagative (){ return "Invalid data from PLC feedback"; }
- @Override
- public String MelsecFxAckWrong (){ return "PLC Feedback Signal Error: "; }
- @Override
- public String MelsecFxCrcCheckFailed (){ return "PLC Feedback message and check failed!"; }
-
- /***********************************************************************************
- *
- * Siemens PLC related
- *
- ************************************************************************************/
-
- @Override
- public String SiemensDBAddressNotAllowedLargerThan255 (){ return "DB block data cannot be greater than 255"; }
- @Override
- public String SiemensReadLengthMustBeEvenNumber (){ return "The length of the data read must be an even number"; }
- @Override
- public String SiemensWriteError (){ return "Writes the data exception, the code name is: "; }
- @Override
- public String SiemensReadLengthCannotLargerThan19 (){ return "The number of arrays read does not allow greater than 19"; }
- @Override
- public String SiemensDataLengthCheckFailed (){ return "Block length checksum failed, please check if Put/get is turned on and DB block optimization is turned off"; }
- @Override
- public String SiemensFWError (){ return "An exception occurred, the specific information to find the Fetch/write protocol document"; }
-
- /***********************************************************************************
- *
- * Omron PLC related
- *
- ************************************************************************************/
-
- @Override
- public String OmronAddressMustBeZeroToFiveteen (){ return "The bit address entered can only be between 0-15"; }
- @Override
- public String OmronReceiveDataError (){ return "Data Receive exception"; }
- @Override
- public String OmronStatus0 (){ return "Communication is normal."; }
- @Override
- public String OmronStatus1 (){ return "The message header is not fins"; }
- @Override
- public String OmronStatus2 (){ return "Data length too long"; }
- @Override
- public String OmronStatus3 (){ return "This command does not support"; }
- @Override
- public String OmronStatus20 (){ return "Exceeding connection limit"; }
- @Override
- public String OmronStatus21 (){ return "The specified node is already in the connection"; }
- @Override
- public String OmronStatus22 (){ return "Attempt to connect to a protected network node that is not yet configured in the PLC"; }
- @Override
- public String OmronStatus23 (){ return "The current client's network node exceeds the normal range"; }
- @Override
- public String OmronStatus24 (){ return "The current client's network node is already in use"; }
- @Override
- public String OmronStatus25 (){ return "All network nodes are already in use"; }
-
-
-
- /***********************************************************************************
- *
- * AB PLC 鐩稿叧
- *
- ************************************************************************************/
-
-
- @Override
- public String AllenBradley04 (){ return "The IOI could not be deciphered. Either it was not formed correctly or the match tag does not exist."; }
- @Override
- public String AllenBradley05 (){ return "The particular item referenced (usually instance) could not be found."; }
- @Override
- public String AllenBradley06 (){ return "The amount of data requested would not fit into the response buffer. Partial data transfer has occurred."; }
- @Override
- public String AllenBradley0A (){ return "An error has occurred trying to process one of the attributes."; }
- @Override
- public String AllenBradley13 (){ return "Not enough command data / parameters were supplied in the command to execute the service requested."; }
- @Override
- public String AllenBradley1C (){ return "An insufficient number of attributes were provided compared to the attribute count."; }
- @Override
- public String AllenBradley1E (){ return "A service request in this service went wrong."; }
- @Override
- public String AllenBradley26 (){ return "The IOI word length did not match the amount of IOI which was processed."; }
-
- @Override
- public String AllenBradleySessionStatus00 (){ return "success"; }
- @Override
- public String AllenBradleySessionStatus01 (){ return "The sender issued an invalid or unsupported encapsulation command."; }
- @Override
- public String AllenBradleySessionStatus02 (){ return "Insufficient memory resources in the receiver to handle the command. This is not an application error. Instead, it only results if the encapsulation layer cannot obtain memory resources that it need."; }
- @Override
- public String AllenBradleySessionStatus03 (){ return "Poorly formed or incorrect data in the data portion of the encapsulation message."; }
- @Override
- public String AllenBradleySessionStatus64 (){ return "An originator used an invalid session handle when sending an encapsulation message."; }
- @Override
- public String AllenBradleySessionStatus65 (){ return "The target received a message of invalid length."; }
- @Override
- public String AllenBradleySessionStatus69 (){ return "Unsupported encapsulation protocol revision."; }
-
- /***********************************************************************************
- *
- * Panasonic PLC 鐩稿叧
- *
- ************************************************************************************/
- @Override
- public String PanasonicReceiveLengthMustLargerThan9 (){ return "The received data length must be greater than 9"; }
- @Override
- public String PanasonicAddressParameterCannotBeNull (){ return "Address parameter is not allowed to be empty"; }
- @Override
- public String PanasonicMewStatus20 (){ return "Error unknown"; }
- @Override
- public String PanasonicMewStatus21 (){ return "Nack error, the remote unit could not be correctly identified, or a data error occurred."; }
- @Override
- public String PanasonicMewStatus22 (){ return "WACK Error: The receive buffer for the remote unit is full."; }
- @Override
- public String PanasonicMewStatus23 (){ return "Multiple port error: The remote unit number (01 to 16) is set to repeat with the local unit."; }
- @Override
- public String PanasonicMewStatus24 (){ return "Transport format error: An attempt was made to send data that does not conform to the transport format, or a frame data overflow or a data error occurred."; }
- @Override
- public String PanasonicMewStatus25 (){ return "Hardware error: Transport system hardware stopped operation."; }
- @Override
- public String PanasonicMewStatus26 (){ return "Unit Number error: The remote unit's numbering setting exceeds the range of 01 to 63."; }
- @Override
- public String PanasonicMewStatus27 (){ return "Error not supported: Receiver data frame overflow. An attempt was made to send data of different frame lengths between different modules."; }
- @Override
- public String PanasonicMewStatus28 (){ return "No answer error: The remote unit does not exist. (timeout)."; }
- @Override
- public String PanasonicMewStatus29 (){ return "Buffer Close error: An attempt was made to send or receive a buffer that is in a closed state."; }
- @Override
- public String PanasonicMewStatus30 (){ return "Timeout error: Persisted in transport forbidden State."; }
- @Override
- public String PanasonicMewStatus40 (){ return "BCC Error: A transmission error occurred in the instruction data."; }
- @Override
- public String PanasonicMewStatus41 (){ return "Malformed: The sent instruction information does not conform to the transmission format."; }
- @Override
- public String PanasonicMewStatus42 (){ return "Error not supported: An unsupported instruction was sent. An instruction was sent to a target station that was not supported."; }
- @Override
- public String PanasonicMewStatus43 (){ return "Processing Step Error: Additional instructions were sent when the transfer request information was suspended."; }
- @Override
- public String PanasonicMewStatus50 (){ return "Link Settings Error: A link number that does not actually exist is set."; }
- @Override
- public String PanasonicMewStatus51 (){ return "Simultaneous operation error: When issuing instructions to other units, the transmit buffer for the local unit is full."; }
- @Override
- public String PanasonicMewStatus52 (){ return "Transport suppression Error: Unable to transfer to other units."; }
- @Override
- public String PanasonicMewStatus53 (){ return "Busy error: Other instructions are being processed when the command is received."; }
- @Override
- public String PanasonicMewStatus60 (){ return "Parameter error: Contains code that cannot be used in the directive, or the code does not have a zone specified parameter (X, Y, D), and so on."; }
- @Override
- public String PanasonicMewStatus61 (){ return "Data error: Contact number, area number, Data code format (BCD,HEX, etc.) overflow, overflow, and area specified error."; }
- @Override
- public String PanasonicMewStatus62 (){ return "Register ERROR: Excessive logging of data in an unregistered state of operations (Monitoring records, tracking records, etc.). )銆�"; }
- @Override
- public String PanasonicMewStatus63 (){ return "PLC mode error: When an instruction is issued, the run mode is not able to process the instruction."; }
- @Override
- public String PanasonicMewStatus65 (){ return "Protection Error: Performs a write operation to the program area or system register in the storage protection state."; }
- @Override
- public String PanasonicMewStatus66 (){ return "Address Error: Address (program address, absolute address, etc.) Data encoding form (BCD, hex, etc.), overflow, underflow, or specified range error."; }
- @Override
- public String PanasonicMewStatus67 (){ return "Missing data error: The data to be read does not exist. (reads data that is not written to the comment register.)"; }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/GenerateMode.java b/src/main/java/com/zy/common/HslCommunication/LogNet/Core/GenerateMode.java
deleted file mode 100644
index bc1a50d..0000000
--- a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/GenerateMode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.common.HslCommunication.LogNet.Core;
-
-/**
- * 鏃ュ織鏂囦欢杈撳嚭妯″紡
- */
-public enum GenerateMode {
-
- /**
- * 鎸夋瘡涓皬鏃剁敓鎴愭棩蹇楁枃浠�
- */
- ByEveryHour,
- /**
- * 鎸夋瘡澶╃敓鎴愭棩蹇楁枃浠�
- */
- ByEveryDay,
- /**
- * 鎸夋瘡涓懆鐢熸垚鏃ュ織鏂囦欢
- */
- ByEveryWeek,
- /**
- * 鎸夋瘡涓湀鐢熸垚鏃ュ織鏂囦欢
- */
- ByEveryMonth,
- /**
- * 鎸夋瘡瀛ｅ害鐢熸垚鏃ュ織鏂囦欢
- */
- ByEverySeason ,
- /**
- * 鎸夋瘡骞寸敓鎴愭棩蹇楁枃浠�
- */
- ByEveryYear,
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageDegree.java b/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageDegree.java
deleted file mode 100644
index bf8a228..0000000
--- a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageDegree.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zy.common.HslCommunication.LogNet.Core;
-
-/**
- * 鏃ュ織鐨勫瓨鍌ㄧ瓑绾�
- */
-public enum HslMessageDegree {
- /**
- * 涓�鏉℃秷鎭兘涓嶈褰�
- */
- None,
- /**
- * 璁板綍鑷村懡绛夌骇鍙婁互涓婃棩蹇楃殑娑堟伅
- */
- FATAL,
- /**
- * 璁板綍寮傚父绛夌骇鍙婁互涓婃棩蹇楃殑娑堟伅
- */
- ERROR,
- /**
- * 璁板綍璀﹀憡绛夌骇鍙婁互涓婃棩蹇楃殑娑堟伅
- */
- WARN,
- /**
- * 璁板綍淇℃伅绛夌骇鍙婁互涓婃棩蹇楃殑娑堟伅
- */
- INFO,
- /**
- * 璁板綍璋冭瘯绛夌骇鍙婁互涓婃棩蹇楃殑淇℃伅
- */
- DEBUG
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageItem.java b/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageItem.java
deleted file mode 100644
index a20c6b7..0000000
--- a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageItem.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.zy.common.HslCommunication.LogNet.Core;
-
-import com.zy.common.HslCommunication.Utilities;
-
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * 鍗曚釜鏃ュ織鐨勮褰曚俊鎭�
- */
-public class HslMessageItem {
-
- private AtomicInteger IdNumber = new AtomicInteger();
- private long id =0;
- private HslMessageDegree degree = HslMessageDegree.DEBUG;
- private int threadId = 0;
- private String text = "";
- private Date time = new Date();
- private String keyWord = "";
-
- /**
- * 榛樿鐨勬棤鍙傛瀯閫犲櫒
- */
- public HslMessageItem()
- {
- id = IdNumber.getAndIncrement();
- }
-
-
- /**
- * 鍗曚釜璁板綍淇℃伅鐨勬爣璇咺D锛岀▼搴忛噸鏂拌繍琛屾椂娓呯┖
- * @return long鏁版嵁绫诲瀷
- */
- public long getId() {
- return id;
- }
-
-
- /**
- * 鑾峰彇娑堟伅鐨勭瓑绾�
- * @return 娑堟伅绛夌骇
- */
- public HslMessageDegree getDegree() {
- return degree;
- }
-
- /**
- * 璁剧疆娑堟伅鐨勭瓑绾�
- * @param degree 娑堟伅绛夌骇
- */
- public void setDegree(HslMessageDegree degree) {
- this.degree = degree;
- }
-
-
- /**
- * 鑾峰彇绾跨▼鐨勬爣璇�
- * @return 绾跨▼id
- */
- public int getThreadId() {
- return threadId;
- }
-
- /**
- * 璁剧疆绾跨▼鐨勬爣璇�
- * @param threadId 绾跨▼id
- */
- public void setThreadId(int threadId) {
- this.threadId = threadId;
- }
-
- /**
- * 鑾峰彇娑堟伅鏂囨湰
- * @return string绫诲瀷鏁版嵁
- */
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆娑堟伅鏂囨湰
- * @param text 娑堟伅鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鑾峰彇褰撳墠鐨勬椂闂翠俊鎭�
- * @return 鏃堕棿绫诲瀷
- */
- public Date getTime() {
- return time;
- }
-
- /**
- * 璁剧疆褰撳墠鐨勬椂闂�
- * @param time 鏃堕棿
- */
- public void setTime(Date time) {
- this.time = time;
- }
-
- /**
- * 鑾峰彇褰撳墠鐨勫叧閿瓧
- * @return string绫诲瀷鐨勫叧閿瓧
- */
- public String getKeyWord() {
- return keyWord;
- }
-
- /**
- * 璁剧疆褰撳墠鐨勫叧閿瓧
- * @param keyWord 鍏抽敭瀛�
- */
- public void setKeyWord(String keyWord) {
- this.keyWord = keyWord;
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString( )
- {
- if (keyWord == null || keyWord.length() == 0)
- {
- return "["+degree.toString()+"] "+ Utilities.getStringDateShort(time,"yyyy-MM-dd HH:mm:ss.fff") + " Thread["+String.format("D2",threadId)+"] "+text;
- }
- else
- {
- return "["+degree.toString()+"] "+ Utilities.getStringDateShort(time,"yyyy-MM-dd HH:mm:ss.fff") + " Thread["+String.format("D2",threadId)+"] " + keyWord +" : "+text;
- }
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆锛屽墧闄や簡鍏抽敭瀛�
- * @return 瀛楃涓叉暟鎹�
- */
- public String ToStringWithoutKeyword()
- {
- return "["+degree.toString()+"] "+ Utilities.getStringDateShort(time,"yyyy-MM-dd HH:mm:ss.fff") + " Thread["+String.format("D2",threadId)+"] "+text;
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/ILogNet.java b/src/main/java/com/zy/common/HslCommunication/LogNet/Core/ILogNet.java
deleted file mode 100644
index a262f43..0000000
--- a/src/main/java/com/zy/common/HslCommunication/LogNet/Core/ILogNet.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.zy.common.HslCommunication.LogNet.Core;
-
-/**
- * 鏃ュ織鐨勫瓨鍌ㄥ璞�
- */
-public interface ILogNet {
-
- /**
- * 鏂囦欢瀛樺偍妯″紡锛�1:鍗曟枃浠讹紝2:鏍规嵁澶у皬锛�3:鏍规嵁鏃堕棿
- * @return
- */
- int LogSaveMode();
-
-
- /**
- * 鑷畾涔夌殑娑堟伅瀛樺偍鏂规硶
- * @param degree
- * @param keyWord
- * @param text
- */
- void RecordMessage(HslMessageDegree degree, String keyWord, String text);
-
-
- /**
- * 鍐欏叆涓�鏉¤皟璇曠殑鏃ュ織
- * @param text
- */
- void WriteDebug(String text);
-
-
- /**
- * 鍐欏叆涓�鏉¤皟璇曠殑鏃ュ織
- * @param keyWord
- * @param text
- */
- void WriteDebug(String keyWord, String text);
-
-
- /**
- * 鍐欏叆涓�鏉¤В閲婃�х殑淇℃伅
- * @param description
- */
- void WriteDescrition(String description);
-
-
- /**
- * 鍐欏叆涓�鏉￠敊璇俊鎭�
- * @param text
- */
- void WriteError(String text);
-
-
- /**
- * 鍐欏叆涓�鏉￠敊璇俊鎭�
- * @param keyWord
- * @param text
- */
- void WriteError(String keyWord, String text);
-
-
- /**
- * 鍐欏叆涓�鏉″紓甯哥殑淇℃伅
- * @param keyWord
- * @param ex
- */
- void WriteException(String keyWord, Exception ex);
-
- /**
- * 鍐欏叆涓�鏉″紓甯哥殑淇℃伅
- * @param keyWord
- * @param text
- * @param ex
- */
- void WriteException(String keyWord, String text, Exception ex);
-
-
- /**
- * 鍐欏叆涓�鏉¤嚧鍛界殑淇℃伅
- * @param text
- */
- void WriteFatal(String text);
-
-
- /**
- * 鍐欏叆涓�鏉¤嚧鍛界殑淇℃伅
- * @param keyWord
- * @param text
- */
- void WriteFatal(String keyWord, String text);
-
-
- /**
- * 鍐欏叆涓�鏉℃櫘閫氱殑淇℃伅
- * @param text
- */
- void WriteInfo(String text);
-
- /**
- * 鍐欏叆涓�鏉℃櫘閫氱殑淇℃伅
- * @param keyWord
- * @param text
- */
- void WriteInfo(String keyWord, String text);
-
-
- /**
- * 鍐欏叆涓�涓┖琛�
- */
- void WriteNewLine();
-
-
- /**
- * 鍐欏叆涓�鏉¤鍛婁俊鎭�
- * @param text
- */
- void WriteWarn(String text);
-
-
- /**
- * 鍐欏叆涓�鏉¤鍛婁俊鎭�
- * @param keyWord
- * @param text
- */
- void WriteWarn(String keyWord, String text);
-
-
- /**
- * 璁剧疆鏃ュ織鐨勫瓨鍌ㄧ瓑绾э紝楂樹簬璇ョ瓑绾х殑鎵嶄細琚瓨鍌�
- * @param degree
- */
- void SetMessageDegree(HslMessageDegree degree);
-
-
- /**
- * 杩囨护鎺夋寚瀹氱殑鍏抽敭瀛楃殑鏃ュ織锛岃淇℃伅涓嶅瓨鍌紝浣嗕粛鐒惰Е鍙態eforeSaveToFile浜嬩欢
- * @param keyword
- */
- void FiltrateKeyword( String keyword );
-
-
- /**
- * 鑾峰彇宸插瓨鍦ㄧ殑鏃ュ織鏂囦欢鍚嶇О
- * @return
- */
- String[] GetExistLogFileNames();
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusAddress.java b/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusAddress.java
deleted file mode 100644
index 22e9862..0000000
--- a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusAddress.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package com.zy.common.HslCommunication.ModBus;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.Address.DeviceAddressBase;
-import com.zy.common.HslCommunication.Utilities;
-
-
-/**
- * Modbus鍗忚鍦板潃鏍煎紡锛屽彲浠ユ惡甯︾珯鍙凤紝鍔熻兘鐮侊紝鍦板潃淇℃伅
- */
-public class ModbusAddress extends DeviceAddressBase {
-
-
-
- /**
- * 瀹炰緥鍖栦竴涓粯璁ょ殑瀵硅薄
- */
- public ModbusAddress() {
- Station = -1;
- Function = ModbusInfo.ReadRegister;
- setAddress(0);
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓粯璁ょ殑瀵硅薄锛屼娇鐢ㄩ粯璁ょ殑鍦板潃鍒濆鍖�
- * @param address
- */
- public ModbusAddress(String address) {
- Station = -1;
- Function = ModbusInfo.ReadRegister;
- setAddress(0);
- AnalysisAddress(address);
- }
-
-
- /**
- * 鑾峰彇绔欏彿
- * @return
- */
- public int getStation() {
- return Station;
- }
-
- /**
- * 璁剧疆绔欏彿
- * @param station
- */
- public void setStation(int station) {
- Station = station;
- }
-
-
- /**
- * 鑾峰彇鍔熻兘鐮�
- * @return
- */
- public byte getFunction() {
- return Function;
- }
-
- /**
- * 璁剧疆鍔熻兘鐮�
- * @param function
- */
- public void setFunction(byte function) {
- Function = function;
- }
-
- private int Station = -1;
-
- private byte Function = -1;
-
-
-
- /**
- * 瑙ｆ瀽Modbus鐨勫湴鍧�鐮�
- * @param address 鍦板潃
- */
- @Override
- public void AnalysisAddress(String address) {
- if (address.indexOf(';') < 0) {
- // 姝ｅ父鍦板潃锛屽姛鑳界爜03
- setAddress(Integer.parseInt(address));
- } else {
- // 甯﹀姛鑳界爜鐨勫湴鍧�
- String[] list = address.split(";");
- for (int i = 0; i < list.length; i++) {
- if (list[i].charAt(0) == 's' || list[i].charAt(0) == 'S') {
- // 绔欏彿淇℃伅
- this.Station = Integer.parseInt(list[i].substring(2));
- } else if (list[i].charAt(0) == 'x' || list[i].charAt(0) == 'X') {
- this.Function = (byte) Integer.parseInt(list[i].substring(2));
- } else {
- setAddress(Integer.parseInt(list[i]));
- }
- }
- }
- }
-
-
-
- /**
- * 鍒涘缓涓�涓鍙栫嚎鍦堢殑瀛楄妭瀵硅薄
- * @param station 璇诲彇鐨勭珯鍙�
- * @param length 璇诲彇鏁版嵁鐨勯暱搴�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateReadCoils(byte station, int length) {
- byte[] buffer = new byte[6];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.ReadCoil;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = Utilities.getBytes(length)[1];
- buffer[5] = Utilities.getBytes(length)[0];
- return buffer;
- }
-
- /**
- * 鍒涘缓涓�涓鍙栫鏁ｈ緭鍏ョ殑瀛楄妭瀵硅薄
- * @param station 璇诲彇鐨勭珯鍙�
- * @param length 璇诲彇鏁版嵁鐨勯暱搴�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateReadDiscrete(byte station, int length) {
- byte[] buffer = new byte[6];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.ReadDiscrete;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = Utilities.getBytes(length)[1];
- buffer[5] = Utilities.getBytes(length)[0];
- return buffer;
- }
-
-
-
- /**
- * 鍒涘缓涓�涓鍙栧瘎瀛樺櫒鐨勫瓧鑺傚璞�
- * @param station 璇诲彇鐨勭珯鍙�
- * @param length 璇诲彇鏁版嵁鐨勯暱搴�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateReadRegister(byte station, int length) {
- byte[] buffer = new byte[6];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = Function;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = Utilities.getBytes(length)[1];
- buffer[5] = Utilities.getBytes(length)[0];
- return buffer;
- }
-
-
- /**
- * 鍒涘缓涓�涓啓鍏ュ崟涓嚎鍦堢殑鎸囦护
- * @param station 绔欏彿
- * @param value 鍊�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateWriteOneCoil(byte station, boolean value) {
- byte[] buffer = new byte[6];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.WriteOneCoil;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = (byte) (value ? 0xFF : 0x00);
- buffer[5] = 0x00;
- return buffer;
- }
-
-
-
- /**
- * 鍒涘缓涓�涓啓鍏ュ崟涓瘎瀛樺櫒鐨勬寚浠�
- * @param station 绔欏彿
- * @param data 鍊�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateWriteOneRegister(byte station, byte[] data) {
- byte[] buffer = new byte[6];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.WriteOneRegister;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = data[1];
- buffer[5] = data[0];
- return buffer;
- }
-
-
-
- /**
- * 鍒涘缓涓�涓啓鍏ユ壒閲忕嚎鍦堢殑鎸囦护
- * @param station 绔欏彿
- * @param values 鍊�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateWriteCoil(byte station, boolean[] values) {
- byte[] data = SoftBasic.BoolArrayToByte(values);
- byte[] buffer = new byte[7 + data.length];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.WriteCoil;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = (byte) (values.length / 256);
- buffer[5] = (byte) (values.length % 256);
- buffer[6] = (byte) (data.length);
- System.arraycopy(data, 0, buffer, 7, data.length);
- return buffer;
- }
-
-
-
- /**
- * 鍒涘缓涓�涓啓鍏ユ壒閲忓瘎瀛樺櫒鐨勬寚浠�
- * @param station 绔欏彿
- * @param values 鍊�
- * @return 鍘熷鐨刴odbus鎸囦护
- */
- public byte[] CreateWriteRegister(byte station, byte[] values) {
- byte[] buffer = new byte[7 + values.length];
- buffer[0] = this.Station < 0 ? station : (byte) this.Station;
- buffer[1] = ModbusInfo.WriteRegister;
- buffer[2] = Utilities.getBytes(this.getAddress())[1];
- buffer[3] = Utilities.getBytes(this.getAddress())[0];
- buffer[4] = (byte) (values.length / 2 / 256);
- buffer[5] = (byte) (values.length / 2 % 256);
- buffer[6] = (byte) (values.length);
- System.arraycopy(values, 0, buffer, 7, values.length);
- return buffer;
- }
-
-
-
- /**
- * 鍦板潃鏂板鎸囧畾鐨勬暟
- * @param value 鍦板潃鍊�
- * @return 鏂板鍚庣殑鍦板潃淇℃伅
- */
- public ModbusAddress AddressAdd(int value) {
- ModbusAddress address = new ModbusAddress();
- address.setAddress(getAddress() + value);
- address.setFunction(getFunction());
- address.setStation(getStation());
- return address;
- }
-
-
-
- /**
- * 鍦板潃鏂板1
- * @return 鏂板鍚庣殑鍦板潃淇℃伅
- */
- public ModbusAddress AddressAdd() {
- return AddressAdd(1);
- }
-
-
-
- /**
- * 鑾峰彇鏈璞＄殑瀛楃涓茶〃绀哄舰寮�
- * @return 瀛楃涓叉暟鎹�
- */
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- if (Station >= 0) sb.append("s=" + Station + ";");
- if (Function >= 1) sb.append("x=" + Function + ";");
- sb.append(String.valueOf(getAddress()));
-
- return sb.toString();
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusInfo.java b/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusInfo.java
deleted file mode 100644
index fdfa3d2..0000000
--- a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusInfo.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.zy.common.HslCommunication.ModBus;
-
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * Modbus鍗忚鐩稿叧鐨勪竴浜涗俊鎭�
- */
-public class ModbusInfo {
-
-
- /**
- * 璇诲彇绾垮湀
- */
- public static final byte ReadCoil = 0x01;
-
- /**
- * 璇诲彇绂绘暎閲�
- */
- public static final byte ReadDiscrete = 0x02;
-
-
- /**
- * 璇诲彇瀵勫瓨鍣�
- */
- public static final byte ReadRegister = 0x03;
-
- /**
- * 璇诲彇杈撳叆瀵勫瓨鍣�
- */
- public static final byte ReadInputRegister = 0x04;
-
-
- /**
- * 鍐欏崟涓嚎鍦�
- */
- public static final byte WriteOneCoil = 0x05;
-
- /**
- * 鍐欏崟涓瘎瀛樺櫒
- */
- public static final byte WriteOneRegister = 0x06;
-
-
- /**
- * 鍐欏涓嚎鍦�
- */
- public static final byte WriteCoil = 0x0F;
-
- /**
- * 鍐欏涓瘎瀛樺櫒
- */
- public static final byte WriteRegister = 0x10;
-
-
- /*****************************************************************************************
- *
- * 鏈湇鍔″櫒鍜屽鎴风鏀寔鐨勫紓甯歌繑鍥�
- *
- *******************************************************************************************/
-
-
- /**
- * 涓嶆敮鎸佽鍔熻兘鐮�
- */
- public static final byte FunctionCodeNotSupport = 0x01;
-
- /**
- * 璇ュ湴鍧�瓒婄晫
- */
- public static final byte FunctionCodeOverBound = 0x02;
-
- /**
- * 璇诲彇闀垮害瓒呰繃鏈�澶у��
- */
- public static final byte FunctionCodeQuantityOver = 0x03;
-
- /**
- * 璇诲啓寮傚父
- */
- public static final byte FunctionCodeReadWriteException = 0x04;
-
-
- /**
- * 灏唌odbus鎸囦护鎵撳寘鎴怣odbus-Tcp鎸囦护
- *
- * @param value Modbus鎸囦护
- * @param id 娑堟伅鐨勫簭鍙�
- * @return Modbus-Tcp鎸囦护
- */
- public static byte[] PackCommandToTcp(byte[] value, int id) {
- byte[] buffer = new byte[value.length + 6];
- buffer[0] = Utilities.getBytes(id)[1];
- buffer[1] = Utilities.getBytes(id)[0];
-
- buffer[4] = Utilities.getBytes(value.length)[1];
- buffer[5] = Utilities.getBytes(value.length)[0];
-
- System.arraycopy(value, 0, buffer, 6, value.length);
- return buffer;
- }
-
-
- /**
- * 鍒嗘瀽Modbus鍗忚鐨勫湴鍧�淇℃伅锛岃鍦板潃閫傚簲浜巘cp鍙妑tu妯″紡
- *
- * @param address 甯︽牸寮忕殑鍦板潃锛屾瘮濡�"100"锛�"x=4;100"锛�"s=1;100","s=1;x=4;100"
- * @param isStartWithZero 璧峰鍦板潃鏄惁浠�0寮�濮�
- * @return 杞崲鍚庣殑鍦板潃淇℃伅
- */
- public static OperateResultExOne<ModbusAddress> AnalysisReadAddress(String address, boolean isStartWithZero) {
- try {
- ModbusAddress mAddress = new ModbusAddress(address);
- if (!isStartWithZero) {
- if (mAddress.getAddress() < 1) throw new Exception("鍦板潃鍊煎湪璧峰鍦板潃涓�1鐨勬儏鍐典笅锛屽繀椤诲ぇ浜�1");
- mAddress.setAddress(mAddress.getAddress() - 1);
- }
- return OperateResultExOne.CreateSuccessResult(mAddress);
- } catch (Exception ex) {
- OperateResultExOne<ModbusAddress> resultExOne = new OperateResultExOne<>();
- resultExOne.Message = ex.getMessage();
- return resultExOne;
- }
- }
-
-
- /**
- * 閫氳繃閿欒鐮佹潵鑾峰彇鍒板搴旂殑鏂囨湰娑堟伅
- *
- * @param code 閿欒鐮�
- * @return 閿欒鐨勬枃鏈弿杩�
- */
- public static String GetDescriptionByErrorCode(byte code) {
- switch (code) {
- case ModbusInfo.FunctionCodeNotSupport:
- return StringResources.Language.ModbusTcpFunctionCodeNotSupport();
- case ModbusInfo.FunctionCodeOverBound:
- return StringResources.Language.ModbusTcpFunctionCodeOverBound();
- case ModbusInfo.FunctionCodeQuantityOver:
- return StringResources.Language.ModbusTcpFunctionCodeQuantityOver();
- case ModbusInfo.FunctionCodeReadWriteException:
- return StringResources.Language.ModbusTcpFunctionCodeReadWriteException();
- default:
- return StringResources.Language.UnknownError();
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusTcpNet.java b/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusTcpNet.java
deleted file mode 100644
index aad93b6..0000000
--- a/src/main/java/com/zy/common/HslCommunication/ModBus/ModbusTcpNet.java
+++ /dev/null
@@ -1,494 +0,0 @@
-package com.zy.common.HslCommunication.ModBus;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.BasicFramework.SoftIncrementCount;
-import com.zy.common.HslCommunication.Core.IMessage.ModbusTcpMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.DataFormat;
-import com.zy.common.HslCommunication.Core.Transfer.ReverseWordTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.io.ByteArrayOutputStream;
-
-
-/**
- * Modbus-Tcp鍗忚鐨勫鎴风閫氳绫伙紝鏂逛究鐨勫拰鏈嶅姟鍣ㄨ繘琛屾暟鎹氦浜�
- */
-public class ModbusTcpNet extends NetworkDeviceBase<ModbusTcpMessage, ReverseWordTransform> {
-
-
- /**
- * 瀹炰緥鍖栦竴涓狹Odbus-Tcp鍗忚鐨勫鎴风瀵硅薄
- */
- public ModbusTcpNet() {
- this.softIncrementCount = new SoftIncrementCount(65535, 0);
- this.WordLength = 1;
- this.station = 1;
- }
-
-
- /**
- * 鎸囧畾鏈嶅姟鍣ㄥ湴鍧�锛岀鍙ｅ彿锛屽鎴风鑷繁鐨勭珯鍙锋潵鍒濆鍖�
- *
- * @param ipAddress 鏈嶅姟鍣ㄧ殑Ip鍦板潃
- * @param port 鏈嶅姟鍣ㄧ殑绔彛鍙�
- * @param station 瀹㈡埛绔嚜韬殑绔欏彿锛屽彲浠ュ湪璇诲彇鐨勬椂鍊欏姩鎬侀厤缃�
- */
- public ModbusTcpNet(String ipAddress, int port, byte station) {
- this.softIncrementCount = new SoftIncrementCount(65535, 0);
- setIpAddress(ipAddress);
- setPort(port);
- this.WordLength = 1;
- this.station = station;
- }
-
-
- private byte station = 0x01; // 鏈鎴风鐨勭珯鍙�
- private SoftIncrementCount softIncrementCount; // 鑷娑堟伅鐨勫璞�
- private boolean isAddressStartWithZero = true; // 绾垮湀鍊肩殑鍦板潃鍊兼槸鍚︿粠闆跺紑濮�
-
-
- /**
- * 鑾峰彇璧峰鍦板潃鏄惁浠�0寮�濮�
- *
- * @return bool鍊�
- */
- public boolean getAddressStartWithZero() {
- return isAddressStartWithZero;
- }
-
- /**
- * 璁剧疆璧峰鍦板潃鏄惁浠�0寮�濮�
- *
- * @param addressStartWithZero true浠ｈ〃浠�0寮�濮嬶紝false浠ｈ〃浠�1寮�濮�
- */
- public void setAddressStartWithZero(boolean addressStartWithZero) {
- this.isAddressStartWithZero = addressStartWithZero;
- }
-
- /**
- * 鑾峰彇绔欏彿
- *
- * @return 绔欏彿
- */
- public byte getStation() {
- return station;
- }
-
- /**
- * 璁剧疆绔欏彿
- *
- * @param station 绔欏彿
- */
- public void setStation(byte station) {
- this.station = station;
- }
-
- /**
- * 璁剧疆澶氬瓧鑺傛暟鎹殑鍙嶈浆绫诲瀷锛岄�傜敤浜巌nt,float,double,long绫诲瀷鐨勬暟鎹�
- *
- * @param dataFormat 鏁版嵁绫诲瀷
- */
- public void setDataFormat(DataFormat dataFormat) {
- getByteTransform().setDataFormat(dataFormat);
- }
-
- /**
- * 鑾峰彇澶氬瓧鑺傛暟鎹殑鍙嶈浆绫诲瀷锛岄�傜敤浜巌nt,float,double,long绫诲瀷鐨勬暟鎹�
- *
- * @return
- */
- public DataFormat getDataFormat() {
- return getByteTransform().getDataFormat();
- }
-
-
- /**
- * 瀛楃涓叉暟鎹槸鍚﹀彂鐢熷弽杞�
- *
- * @return bool鍊�
- */
- public boolean isStringReverse() {
- return getByteTransform().IsStringReverse;
- }
-
- /**
- * 璁剧疆瀛楃涓叉暟鎹槸鍚﹀弽杞�
- *
- * @param stringReverse bool鍊�
- */
- public void setStringReverse(boolean stringReverse) {
- getByteTransform().IsStringReverse = stringReverse;
- }
-
-
- private OperateResultExOne<byte[]> BuildReadCoilCommand(String address, short count) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateReadCoils(station, count), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
- private OperateResultExOne<byte[]> BuildReadDiscreteCommand(String address, short length) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateReadDiscrete(station, length), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildReadRegisterCommand(String address, short length) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateReadRegister(station, length), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildReadRegisterCommand(ModbusAddress address, short length) {
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(address.CreateReadRegister(station, length), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildWriteOneCoilCommand(String address, boolean value) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateWriteOneCoil(station, value), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildWriteOneRegisterCommand(String address, byte[] data) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateWriteOneRegister(station, data), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildWriteCoilCommand(String address, boolean[] values) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateWriteCoil(station, values), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- private OperateResultExOne<byte[]> BuildWriteRegisterCommand(String address, byte[] values) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- short messageId = (short) softIncrementCount.GetCurrentValue();
- // 鐢熸垚鏈�缁坱cp鎸囦护
- byte[] buffer = ModbusInfo.PackCommandToTcp(analysis.Content.CreateWriteRegister(station, values), messageId);
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- /**
- * 妫�鏌ュ綋鍓嶇殑Modbus-Tcp鍝嶅簲鏄惁鏄纭殑
- *
- * @param send 鍙戦�佺殑鏁版嵁淇℃伅
- * @return 甯︽槸鍚︽垚鍔熺殑缁撴灉鏁版嵁
- */
- private OperateResultExOne<byte[]> CheckModbusTcpResponse(byte[] send) {
- OperateResultExOne<byte[]> result = ReadFromCoreServer(send);
- if (result.IsSuccess) {
- if ((send[7] + 0x80) == result.Content[7]) {
- // 鍙戠敓浜嗛敊璇�
- result.IsSuccess = false;
- result.Message = ModbusInfo.GetDescriptionByErrorCode(result.Content[8]);
- result.ErrorCode = result.Content[8];
- }
- }
- return result;
- }
-
- /**
- * 璇诲彇鏈嶅姟鍣ㄧ殑鏁版嵁锛岄渶瑕佹寚瀹氫笉鍚岀殑鍔熻兘鐮�
- *
- * @param address 鍦板潃
- * @param length 闀垮害
- * @return 缁撴灉鏁版嵁
- */
- private OperateResultExOne<byte[]> ReadModBusBase(ModbusAddress address, short length) {
- OperateResultExOne<byte[]> command = BuildReadRegisterCommand(address, length);
- if (!command.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(command);
-
- OperateResultExOne<byte[]> resultBytes = CheckModbusTcpResponse(command.Content);
- if (resultBytes.IsSuccess) {
- // 浜屾鏁版嵁澶勭悊
- if (resultBytes.Content.length >= 9) {
- byte[] buffer = new byte[resultBytes.Content.length - 9];
- System.arraycopy(resultBytes.Content, 9, buffer, 0, buffer.length);
- resultBytes.Content = buffer;
- }
- }
- return resultBytes;
- }
-
-
- /**
- * 璇诲彇鏈嶅姟鍣ㄧ殑鏁版嵁锛岄渶瑕佹寚瀹氫笉鍚岀殑鍔熻兘鐮�
- *
- * @param code 鎸囦护
- * @param address 鍦板潃
- * @param length 闀垮害
- * @return 鎸囦护瀛楄妭淇℃伅
- */
- private OperateResultExOne<byte[]> ReadModBusBase(byte code, String address, short length) {
-
- OperateResultExOne<byte[]> command = null;
- switch (code) {
- case ModbusInfo.ReadCoil: {
- command = BuildReadCoilCommand(address, length);
- break;
- }
- case ModbusInfo.ReadDiscrete: {
- command = BuildReadDiscreteCommand(address, length);
- break;
- }
- case ModbusInfo.ReadRegister: {
- command = BuildReadRegisterCommand(address, length);
- break;
- }
- default: {
- command = new OperateResultExOne<byte[]>();
- command.Message = StringResources.Language.ModbusTcpFunctionCodeNotSupport();
- break;
- }
- }
- if (!command.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(command);
-
- OperateResultExOne<byte[]> resultBytes = CheckModbusTcpResponse(command.Content);
- if (resultBytes.IsSuccess) {
- // 浜屾鏁版嵁澶勭悊
- if (resultBytes.Content.length >= 9) {
- byte[] buffer = new byte[resultBytes.Content.length - 9];
- System.arraycopy(resultBytes, 9, buffer, 0, buffer.length);
- resultBytes.Content = buffer;
- }
- }
- return resultBytes;
-
- }
-
-
- /**
- * 璇诲彇绾垮湀锛岄渶瑕佹寚瀹氳捣濮嬪湴鍧�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"
- * @return 甯︽湁鎴愬姛鏍囧織鐨刡ool瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadCoil(String address) {
- OperateResultExOne<byte[]> read = ReadModBusBase(ModbusInfo.ReadCoil, address, (short) 1);
- if (!read.IsSuccess) return OperateResultExOne.<Boolean>CreateFailedResult(read);
-
- return GetBoolResultFromBytes(read);
- }
-
-
- /**
- * 鎵归噺鐨勮鍙栫嚎鍦堬紝闇�瑕佹寚瀹氳捣濮嬪湴鍧�锛岃鍙栭暱搴�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"
- * @param length 璇诲彇闀垮害
- * @return 甯︽湁鎴愬姛鏍囧織鐨刡ool鏁扮粍瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadCoil(String address, short length) {
- OperateResultExOne<byte[]> read = ReadModBusBase(ModbusInfo.ReadCoil, address, length);
- if (!read.IsSuccess) return OperateResultExOne.<boolean[]>CreateFailedResult(read);
-
- return OperateResultExOne.CreateSuccessResult(SoftBasic.ByteToBoolArray(read.Content, length));
- }
-
-
- /**
- * 璇诲彇杈撳叆绾垮湀锛岄渶瑕佹寚瀹氳捣濮嬪湴鍧�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"
- * @return 甯︽湁鎴愬姛鏍囧織鐨刡ool瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadDiscrete(String address) {
- OperateResultExOne<byte[]> read = ReadModBusBase(ModbusInfo.ReadDiscrete, address, (short) 1);
- if (!read.IsSuccess) return OperateResultExOne.<Boolean>CreateFailedResult(read);
-
- return GetBoolResultFromBytes(read);
- }
-
-
- /**
- * 鎵归噺鐨勮鍙栬緭鍏ョ偣锛岄渶瑕佹寚瀹氳捣濮嬪湴鍧�锛岃鍙栭暱搴�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"
- * @param length 璇诲彇闀垮害
- * @return 甯︽湁鎴愬姛鏍囧織鐨刡ool鏁扮粍瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadDiscrete(String address, short length) {
- OperateResultExOne<byte[]> read = ReadModBusBase(ModbusInfo.ReadDiscrete, address, length);
- if (!read.IsSuccess) return OperateResultExOne.<boolean[]>CreateFailedResult(read);
-
- return OperateResultExOne.CreateSuccessResult(SoftBasic.ByteToBoolArray(read.Content, length));
- }
-
-
- /**
- * 浠嶮odbus鏈嶅姟鍣ㄦ壒閲忚鍙栧瘎瀛樺櫒鐨勪俊鎭紝闇�瑕佹寚瀹氳捣濮嬪湴鍧�锛岃鍙栭暱搴�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"锛屾垨鑰呮槸甯﹀姛鑳界爜鏍煎紡03X1234
- * @param length 璇诲彇鐨勬暟閲�
- * @return 甯︽湁鎴愬姛鏍囧織鐨勫瓧鑺備俊鎭�
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- OperateResultExOne<ModbusAddress> analysis = ModbusInfo.AnalysisReadAddress(address, isAddressStartWithZero);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
- int alreadyFinished = 0;
- while (alreadyFinished < length) {
- short lengthTmp = (short) Math.min((length - alreadyFinished), 120);
- OperateResultExOne<byte[]> read = ReadModBusBase(analysis.Content.AddressAdd(alreadyFinished), lengthTmp);
- if (!read.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(read);
-
- try {
- outputStream.write(read.Content);
- } catch (Exception ex) {
-
- }
- alreadyFinished += lengthTmp;
- }
-
- byte[] data = outputStream.toByteArray();
- try {
- outputStream.close();
- } catch (Exception ex) {
-
- }
- return OperateResultExOne.CreateSuccessResult(data);
- }
-
- /**
- * 鍐欎竴涓瘎瀛樺櫒鏁版嵁
- *
- * @param address 璧峰鍦板潃
- * @param high 楂樹綅
- * @param low 鍦颁綅
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult WriteOneRegister(String address, byte high, byte low) {
- OperateResultExOne<byte[]> command = BuildWriteOneRegisterCommand(address, new byte[]{high, low});
- if (!command.IsSuccess) {
- return command;
- }
-
- return CheckModbusTcpResponse(command.Content);
- }
-
- /**
- * 鍐欎竴涓瘎瀛樺櫒鏁版嵁
- *
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult WriteOneRegister(String address, short value) {
- byte[] buffer = Utilities.getBytes(value);
- return WriteOneRegister(address, buffer[1], buffer[0]);
- }
-
- /**
- * 灏嗘暟鎹啓鍏ュ埌Modbus鐨勫瘎瀛樺櫒涓婂幓锛岄渶瑕佹寚瀹氳捣濮嬪湴鍧�鍜屾暟鎹唴瀹�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负"1234"
- * @param value 鍐欏叆鐨勬暟鎹紝闀垮害鏍规嵁data鐨勯暱搴︽潵鎸囩ず
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- OperateResultExOne<byte[]> command = BuildWriteRegisterCommand(address, value);
- if (!command.IsSuccess) {
- return command;
- }
-
- return CheckModbusTcpResponse(command.Content);
- }
-
- /**
- * 鍐欎竴涓嚎鍦堜俊鎭紝鎸囧畾鏄惁閫氭柇
- *
- * @param address 璧峰鍦板潃
- * @param value 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult WriteCoil(String address, boolean value) {
- OperateResultExOne<byte[]> command = BuildWriteOneCoilCommand(address, value);
- if (!command.IsSuccess) {
- return command;
- }
-
- return CheckModbusTcpResponse(command.Content);
- }
-
- /**
- * 鍐欑嚎鍦堟暟缁勶紝鎸囧畾鏄惁閫氭柇
- *
- * @param address 璧峰鍦板潃
- * @param values 鍐欏叆鍊�
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult WriteCoil(String address, boolean[] values) {
- OperateResultExOne<byte[]> command = BuildWriteCoilCommand(address, values);
- if (!command.IsSuccess) {
- return command;
- }
-
- return CheckModbusTcpResponse(command.Content);
- }
-
- /**
- * 鍚戝瘎瀛樺櫒涓啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,閭ｄ箞data[0]瀵瑰簲M100.0
- *
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- return Write(address, SoftBasic.BoolArrayToByte(values));
- }
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString() {
- return "ModbusTcpNet[" + getIpAddress() + ":"+getPort()+"]";
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1EDataType.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1EDataType.java
deleted file mode 100644
index 96c9e1a..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1EDataType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-/**
- * 涓夎彵PLC鐨勬暟鎹被鍨嬶紝姝ゅ鍖呭惈浜嗗嚑涓父鐢ㄧ殑绫诲瀷
- */
-public class MelsecA1EDataType {
- /**
- * 濡傛灉鎮ㄦ竻妤氱被鍨嬩唬鍙凤紝鍙互鏍规嵁鍊艰繘琛屾墿灞�
- * @param code 鏁版嵁绫诲瀷鐨勪唬鍙�
- * @param type 0鎴�1锛岄粯璁や负0
- * @param asciiCode ASCII鏍煎紡鐨勭被鍨嬩俊鎭�
- * @param fromBase >鎸囩ず鍦板潃鐨勫灏戣繘鍒剁殑锛�10鎴栨槸16
- */
- public MelsecA1EDataType( byte[] code, byte type, String asciiCode, int fromBase )
- {
- DataCode = code;
- AsciiCode = asciiCode;
- FromBase = fromBase;
- if (type < 2) DataType = type;
- }
-
- private byte[] DataCode = new byte[2];
- private byte DataType = 0x00;
- private String AsciiCode = "";
- private int FromBase = 0;
-
- /**
- * 绫诲瀷鐨勪唬鍙峰�硷紙杞厓浠朵唬鐮侊紝鐢ㄤ簬鍖哄垎杞厓浠剁被鍨嬶紝濡傦細D锛孯锛�
- * @return
- */
- public byte[] getDataCode(){
- return DataCode;
- }
-
- /**
- * 鏁版嵁鐨勭被鍨嬶紝0浠ｈ〃鎸夊瓧锛�1浠ｈ〃鎸変綅
- * @return
- */
- public byte getDataType(){
- return DataType;
- }
-
- /**
- * 褰撲互ASCII鏍煎紡閫氳鏃剁殑绫诲瀷鎻忚堪
- * @return
- */
- public String getAsciiCode(){
- return AsciiCode;
- }
-
- /**
- * 鎸囩ず鍦板潃鏄�10杩涘埗锛岃繕鏄�16杩涘埗鐨�
- * @return
- */
- public int getFromBase(){
- return FromBase;
- }
-
-
- /**
- * X杈撳叆瀵勫瓨鍣�
- */
- public final static MelsecA1EDataType X = new MelsecA1EDataType( new byte[] {0x58, 0x20}, (byte) 0x01, "X*", 8 );
-
- /**
- * Y杈撳嚭瀵勫瓨鍣�
- */
- public final static MelsecA1EDataType Y = new MelsecA1EDataType( new byte[] {0x59,0x20}, (byte)0x01, "Y*", 8 );
-
- /**
- * M涓棿瀵勫瓨鍣�
- */
- public final static MelsecA1EDataType M = new MelsecA1EDataType( new byte[] {0x4D,0x20}, (byte)0x01, "M*", 10 );
-
- /**
- * S鐘舵�佸瘎瀛樺櫒
- */
- public final static MelsecA1EDataType S = new MelsecA1EDataType( new byte[] {0x53,0x20}, (byte)0x01, "S*", 10 );
-
- /**
- * D鏁版嵁瀵勫瓨鍣�
- */
- public final static MelsecA1EDataType D = new MelsecA1EDataType( new byte[] {0x44,0x20}, (byte)0x00, "D*", 10 );
-
- /**
- * R鏂囦欢瀵勫瓨鍣�
- */
- public final static MelsecA1EDataType R = new MelsecA1EDataType( new byte[] { 0x52, 0x20 }, (byte)0x00, "R*", 10 );
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1ENet.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1ENet.java
deleted file mode 100644
index e7ae89e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1ENet.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-import com.zy.common.HslCommunication.Core.IMessage.MelsecA1EBinaryMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.RegularByteTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-
-/**
- * 涓夎彵PLC閫氳鍗忚锛岄噰鐢ˋ鍏煎1E甯у崗璁疄鐜帮紝浣跨敤浜岃繘鍒剁爜閫氳锛岃鏍规嵁瀹為檯鍨嬪彿鏉ヨ繘琛岄�夊彇
- */
-public class MelsecA1ENet extends NetworkDeviceBase<MelsecA1EBinaryMessage,RegularByteTransform> {
-
-
- /**
- * 瀹炰緥鍖栦笁鑿辩殑A鍏煎1E甯у崗璁殑閫氳瀵硅薄
- */
- public MelsecA1ENet() {
- WordLength = 1;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓笁鑿辩殑A鍏煎1E甯у崗璁殑閫氳瀵硅薄
- *
- * @param ipAddress PLCd鐨処p鍦板潃
- * @param port PLC鐨勭鍙�
- */
- public MelsecA1ENet(String ipAddress, int port) {
- WordLength = 1;
- super.setIpAddress(ipAddress);
- super.setPort(port);
- }
-
-
- private byte PLCNumber = (byte) (0xFF); // PLC缂栧彿
-
- /**
- * 鑾峰彇PLC缂栧彿
- *
- * @return PLC缂栧彿
- */
- public byte getPLCNumber() {
- return PLCNumber;
- }
-
- /**
- * 璁剧疆PLC缂栧彿
- *
- * @param plcNumber PLC缂栧彿
- */
- public void setPLCNumber(byte plcNumber) {
- PLCNumber = plcNumber;
- }
-
-
- /**
- * 浠庝笁鑿盤LC涓鍙栨兂瑕佺殑鏁版嵁锛岃繑鍥炶鍙栫粨鏋�
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"M100","D100","W1A0"
- * @param length 璇诲彇鐨勬暟鎹暱搴︼紝瀛楁渶澶у��960锛屼綅鏈�澶у��7168
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- // 鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildReadCommand( address, length, PLCNumber );
- if (!command.IsSuccess) return OperateResultExOne.CreateFailedResult( command );
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult( read );
-
- // 閿欒浠ｇ爜楠岃瘉
- if (read.Content[1] != 0) return new OperateResultExOne<>( read.Content[1], StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鏁版嵁瑙ｆ瀽锛岄渶瑕佷紶鍏ユ槸鍚︿娇鐢ㄤ綅鐨勫弬鏁�
- return ExtractActualData( read.Content, command.Content[0] == 0x00 );
- }
-
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @param length 璇诲彇鐨勯暱搴�
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadBool(String address, short length) {
- // 瑙ｆ瀽鍦板潃
- OperateResultExTwo<MelsecA1EDataType, Short> analysis = MelsecHelper.McA1EAnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult( analysis );
-
- // 浣嶈鍙栨牎楠�
- if (analysis.Content1.getDataType() == 0x00) return new OperateResultExOne<boolean[]>( 0, StringResources.Language.MelsecReadBitInfo() );
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = Read( address, length );
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult( read );
-
- // 杞寲bool鏁扮粍
- boolean[] result = new boolean[read.Content.length];
- for(int i=0;i<result.length;i++){
- if(read.Content[i] == 0x01) result[i] = true;
- }
- return OperateResultExOne.CreateSuccessResult( result );
- }
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadBool(String address) {
- OperateResultExOne<boolean[]> read = ReadBool(address, (short) 1);
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult(read);
-
- return OperateResultExOne.CreateSuccessResult(read.Content[0]);
- }
-
-
-
-
-
- /**
- * 鍚慞LC鍐欏叆鏁版嵁锛屾暟鎹牸寮忎负鍘熷鐨勫瓧鑺傜被鍨�
- * @param address 璧峰鍦板潃
- * @param value 鍘熷鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- // 瑙ｆ瀽鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteCommand( address, value, PLCNumber );
- if (!command.IsSuccess) return command;
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return read;
-
- // 閿欒鐮佹牎楠� (鍦ˋ鍏煎1E鍗忚涓紝缁撴潫浠ｇ爜鍚庨潰绱ц窡鐨勬槸寮傚父淇℃伅鐨勪唬鐮�)
- if (read.Content[1] != 0) return new OperateResultExOne<byte[]>( read.Content[1], StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鎴愬姛
- return OperateResult.CreateSuccessResult( );
- }
-
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean value) {
- return Write(address, new boolean[]{value});
- }
-
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛屽彲浠ユ寚瀹氫换鎰忕殑闀垮害
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- byte[] buffer = new byte[values.length];
- for (int i = 0; i < values.length; i++) {
- buffer[i] = values[i] ? (byte) 0x01 : (byte) 0x00;
- }
- return Write(address, buffer);
- }
-
-
- /**
- * 鑾峰彇褰撳墠瀵硅薄鐨勫瓧绗︿覆鏍囪瘑褰㈠紡
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString() {
- return "MelsecA1ENet";
- }
-
-
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(String address, short length) {
- return BuildReadCommand(address,length,(byte)0xFF);
- }
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @param plcNumber PLC鍙�
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(String address, short length, byte plcNumber) {
- OperateResultExTwo<MelsecA1EDataType, Short> analysis = MelsecHelper.McA1EAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- byte subtitle = analysis.Content1.getDataType() == 0x01 ? (byte)0x00 : (byte)0x01;
-
- byte[] _PLCCommand = new byte[12];
- _PLCCommand[0] = subtitle; // 鍓爣棰�
- _PLCCommand[1] = plcNumber; // PLC鍙�
- _PLCCommand[2] = 0x0A; // CPU鐩戣瀹氭椂鍣紙L锛夎繖閲岃缃负0x00,0x0A锛岀瓑寰匔PU杩斿洖鐨勬椂闂翠负10*250ms=2.5绉�
- _PLCCommand[3] = 0x00; // CPU鐩戣瀹氭椂鍣紙H锛�
- _PLCCommand[4] = (byte)(analysis.Content2 % 256); // 璧峰杞厓浠讹紙寮�濮嬭鍙栫殑鍦板潃锛�
- _PLCCommand[5] = (byte)(analysis.Content2 / 256);
- _PLCCommand[6] = 0x00;
- _PLCCommand[7] = 0x00;
- _PLCCommand[8] = analysis.Content1.getDataCode()[1]; // 杞厓浠朵唬鐮侊紙L锛�
- _PLCCommand[9] = analysis.Content1.getDataCode()[0]; // 杞厓浠朵唬鐮侊紙H锛�
- _PLCCommand[10] = (byte)(length % 256); // 杞厓浠剁偣鏁�
- _PLCCommand[11] = 0x00;
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param address 璧峰鍦板潃
- * @param value 鍊�
- * @return 缁撴灉
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value) {
- return BuildWriteCommand(address,value,(byte)0xFF);
- }
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param address 璧峰鍦板潃
- * @param value 鍊�
- * @param plcNumber PLC鍙�
- * @return 缁撴灉
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value, byte plcNumber) {
- OperateResultExTwo<MelsecA1EDataType, Short> analysis = MelsecHelper.McA1EAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- int length = -1;
- if (analysis.Content1.getDataType() == 1)
- {
- // 鎸夌収浣嶅啓鍏ョ殑鎿嶄綔锛屾暟鎹渶瑕侀噸鏂拌绠�
- length = value.length;
- value = MelsecHelper.TransBoolArrayToByteData( value );
- }
-
- byte subtitle = analysis.Content1.getDataType() == 0x01 ? (byte)0x02 : (byte)0x03;
-
- byte[] _PLCCommand = new byte[12 + value.length];
- _PLCCommand[0] = subtitle; // 鍓爣棰�
- _PLCCommand[1] = plcNumber; // PLC鍙�
- _PLCCommand[2] = 0x0A; // CPU鐩戣瀹氭椂鍣紙L锛夎繖閲岃缃负0x00,0x0A锛岀瓑寰匔PU杩斿洖鐨勬椂闂翠负10*250ms=2.5绉�
- _PLCCommand[3] = 0x00; // CPU鐩戣瀹氭椂鍣紙H锛�
- _PLCCommand[4] = (byte)(analysis.Content2 % 256); // 璧峰杞厓浠讹紙寮�濮嬭鍙栫殑鍦板潃锛�
- _PLCCommand[5] = (byte)(analysis.Content2 / 256);
- _PLCCommand[6] = 0x00;
- _PLCCommand[7] = 0x00;
- _PLCCommand[8] = analysis.Content1.getDataCode()[1]; // 杞厓浠朵唬鐮侊紙L锛�
- _PLCCommand[9] = analysis.Content1.getDataCode()[0]; // 杞厓浠朵唬鐮侊紙H锛�
- _PLCCommand[10] = (byte)(length % 256); // 杞厓浠剁偣鏁�
- _PLCCommand[11] = 0x00;
-
- // 鍒ゆ柇鏄惁杩涜浣嶆搷浣�
- if (analysis.Content1.getDataType() == 1) {
- if (length > 0) {
- _PLCCommand[10] = (byte)(length % 256); // 杞厓浠剁偣鏁�
- }
- else {
- _PLCCommand[10] = (byte)(value.length * 2 % 256); // 杞厓浠剁偣鏁�
- }
- } else {
- _PLCCommand[10] = (byte)(value.length / 2 % 256); // 杞厓浠剁偣鏁�
- }
-
- System.arraycopy(value, 0, _PLCCommand, 12, value.length);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 浠嶱LC鍙嶉鐨勬暟鎹腑鎻愬彇鍑哄疄闄呯殑鏁版嵁鍐呭锛岄渶瑕佷紶鍏ュ弽棣堟暟鎹紝鏄惁浣嶈鍙�
- * @param response 鍙嶉鐨勬暟鎹唴瀹�
- * @param isBit 鏄惁浣嶈鍙�
- * @return 瑙ｆ瀽鍚庣殑缁撴灉瀵硅薄
- */
- public static OperateResultExOne<byte[]> ExtractActualData( byte[] response, boolean isBit )
- {
- if (isBit)
- {
- // 浣嶈鍙�
- byte[] Content = new byte[(response.length - 2) * 2];
- for (int i = 2; i < response.length; i++)
- {
- if ((response[i] & 0x10) == 0x10)
- {
- Content[(i - 2) * 2 + 0] = 0x01;
- }
-
- if ((response[i] & 0x01) == 0x01)
- {
- Content[(i - 2) * 2 + 1] = 0x01;
- }
- }
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- else
- {
- // 瀛楄鍙�
- byte[] Content = new byte[response.length - 2];
- System.arraycopy(response,2,Content,0,Content.length);
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecHelper.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecHelper.java
deleted file mode 100644
index a94afa0..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecHelper.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * 鎵�鏈変笁鑿遍�氳绫荤殑閫氱敤杈呭姪宸ュ叿绫伙紝鍖呭惈浜嗕竴浜涢�氱敤鐨勯潤鎬佹柟娉曪紝鍙互浣跨敤鏈被鏉ヨ幏鍙栦竴浜涘師濮嬬殑鎶ユ枃淇℃伅銆傝缁嗙殑鎿嶄綔鍙傝渚嬪瓙
- */
-public class MelsecHelper {
-
- /**
- * 瑙ｆ瀽A1E鍗忚鏁版嵁鍦板潃
- * @param address 鏁版嵁鍦板潃
- * @return 瑙ｆ瀽鍊�
- */
- public static OperateResultExTwo<MelsecA1EDataType, Short> McA1EAnalysisAddress( String address )
- {
- OperateResultExTwo<MelsecA1EDataType, Short> result = new OperateResultExTwo<MelsecA1EDataType, Short>();
- try {
- switch (address.charAt(0)) {
- case 'X':
- case 'x': {
- result.Content1 = MelsecA1EDataType.X;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.X.getFromBase());
- break;
- }
- case 'Y':
- case 'y': {
- result.Content1 = MelsecA1EDataType.Y;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.Y.getFromBase());
- break;
- }
- case 'M':
- case 'm': {
- result.Content1 = MelsecA1EDataType.M;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.M.getFromBase());
- break;
- }
- case 'S':
- case 's': {
- result.Content1 = MelsecA1EDataType.S;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.S.getFromBase());
- break;
- }
- case 'D':
- case 'd': {
- result.Content1 = MelsecA1EDataType.D;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.D.getFromBase());
- break;
- }
- case 'R':
- case 'r': {
- result.Content1 = MelsecA1EDataType.R;
- result.Content2 = Short.parseShort(address.substring(1), MelsecA1EDataType.R.getFromBase());
- break;
- }
- default:
- throw new Exception("杈撳叆鐨勭被鍨嬩笉鏀寔锛岃閲嶆柊杈撳叆");
- }
- } catch (Exception ex) {
- result.Message = "鍦板潃鏍煎紡濉啓閿欒锛�" + ex.getMessage();
- return result;
- }
-
- result.IsSuccess = true;
- return result;
- }
-
- /**
- * 瑙ｆ瀽鏁版嵁鍦板潃
- * @param address 鏁版嵁鍦板潃
- * @return 瑙ｆ瀽鍊�
- */
- public static OperateResultExTwo<MelsecMcDataType, Short> McAnalysisAddress( String address )
- {
- OperateResultExTwo<MelsecMcDataType, Short> result = new OperateResultExTwo<MelsecMcDataType, Short>();
- try {
- switch (address.charAt(0)) {
- case 'M':
- case 'm': {
- result.Content1 = MelsecMcDataType.M;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.M.getFromBase());
- break;
- }
- case 'X':
- case 'x': {
- result.Content1 = MelsecMcDataType.X;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.X.getFromBase());
- break;
- }
- case 'Y':
- case 'y': {
- result.Content1 = MelsecMcDataType.Y;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.Y.getFromBase());
- break;
- }
- case 'D':
- case 'd': {
- result.Content1 = MelsecMcDataType.D;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.D.getFromBase());
- break;
- }
- case 'W':
- case 'w': {
- result.Content1 = MelsecMcDataType.W;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.W.getFromBase());
- break;
- }
- case 'L':
- case 'l': {
- result.Content1 = MelsecMcDataType.L;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.L.getFromBase());
- break;
- }
- case 'F':
- case 'f': {
- result.Content1 = MelsecMcDataType.F;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.F.getFromBase());
- break;
- }
- case 'V':
- case 'v': {
- result.Content1 = MelsecMcDataType.V;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.V.getFromBase());
- break;
- }
- case 'B':
- case 'b': {
- result.Content1 = MelsecMcDataType.B;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.B.getFromBase());
- break;
- }
- case 'R':
- case 'r': {
- result.Content1 = MelsecMcDataType.R;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.R.getFromBase());
- break;
- }
- case 'S':
- case 's': {
- result.Content1 = MelsecMcDataType.S;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.S.getFromBase());
- break;
- }
- case 'Z':
- case 'z': {
- result.Content1 = MelsecMcDataType.Z;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.Z.getFromBase());
- break;
- }
- case 'T':
- case 't': {
- result.Content1 = MelsecMcDataType.T;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.T.getFromBase());
- break;
- }
- case 'C':
- case 'c': {
- result.Content1 = MelsecMcDataType.C;
- result.Content2 = Short.parseShort(address.substring(1), MelsecMcDataType.C.getFromBase());
- break;
- }
- default:
- throw new Exception("杈撳叆鐨勭被鍨嬩笉鏀寔锛岃閲嶆柊杈撳叆");
- }
- } catch (Exception ex) {
- result.Message = "鍦板潃鏍煎紡濉啓閿欒锛�" + ex.getMessage();
- return result;
- }
-
- result.IsSuccess = true;
- return result;
- }
-
-
- /**
- * 浠庡瓧鑺傛瀯寤轰竴涓狝SCII鏍煎紡鐨勫湴鍧�瀛楄妭
- * @param value 瀛楄妭淇℃伅
- * @return ASCII鏍煎紡鐨勫湴鍧�
- */
- public static byte[] BuildBytesFromData(byte value )
- {
- return Utilities.getBytes(String.format("%02x",value),"ASCII");
- }
-
-
- /**
- * 浠巗hort鏁版嵁鏋勫缓涓�涓狝SCII鏍煎紡鍦板潃瀛楄妭
- * @param value short鍊�
- * @return ASCII鏍煎紡鐨勫湴鍧�
- */
- public static byte[] BuildBytesFromData( short value )
- {
- return Utilities.getBytes(String.format("%04x",value),"ASCII");
- }
-
- /**
- * 浠巌nt鏁版嵁鏋勫缓涓�涓狝SCII鏍煎紡鍦板潃瀛楄妭
- * @param value int鍊�
- * @return ASCII鏍煎紡鐨勫湴鍧�
- */
- public static byte[] BuildBytesFromData( int value )
- {
- return Utilities.getBytes(String.format("%04x",value),"ASCII");
- }
-
-
- /**
- * 浠庝笁鑿辩殑鍦板潃涓瀯寤篗C鍗忚鐨�6瀛楄妭鐨凙SCII鏍煎紡鐨勫湴鍧�
- * @param address 涓夎彵鍦板潃
- * @param type 涓夎彵鐨勬暟鎹被鍨�
- * @return 6瀛楄妭鐨凙SCII鏍煎紡鐨勫湴鍧�
- */
- public static byte[] BuildBytesFromAddress( int address, MelsecMcDataType type )
- {
- return Utilities.getBytes(String.format(type.getFromBase() == 10 ? "%06d" : "%06x",address),"ASCII");
- }
-
-
- /**
- * 浠庡瓧鑺傛暟缁勬瀯寤轰竴涓狝SCII鏍煎紡鐨勫湴鍧�瀛楄妭
- * @param value 瀛楄妭淇℃伅
- * @return ASCII鏍煎紡鐨勫湴鍧�
- */
- public static byte[] BuildBytesFromData( byte[] value )
- {
- byte[] buffer = new byte[value.length * 2];
- for (int i = 0; i < value.length; i++)
- {
- byte[] data = BuildBytesFromData( value[i] );
- buffer[2*i+0] = data[0];
- buffer[2*i+1] = data[1];
- }
- return buffer;
- }
-
-
- /**
- * 灏�0锛�1锛�0锛�1鐨勫瓧鑺傛暟缁勫帇缂╂垚涓夎彵鏍煎紡鐨勫瓧鑺傛暟缁勬潵琛ㄧず寮�鍏抽噺鐨�
- * @param value 鍘熷鐨勬暟鎹瓧鑺�
- * @return 鍘嬬缉杩囧悗鐨勬暟鎹瓧鑺�
- */
- public static byte[] TransBoolArrayToByteData( byte[] value )
- {
- int length = value.length % 2 == 0 ? value.length / 2 : (value.length / 2) + 1;
- byte[] buffer = new byte[length];
-
- for (int i = 0; i < length; i++)
- {
- if (value[i * 2 + 0] != 0x00) buffer[i] += 0x10;
- if ((i * 2 + 1) < value.length)
- {
- if (value[i * 2 + 1] != 0x00) buffer[i] += 0x01;
- }
- }
-
- return buffer;
- }
-
-
- /**
- * 璁＄畻Fx鍗忚鎸囦护鐨勫拰鏍￠獙淇℃伅
- * @param data 瀛楄妭鏁版嵁
- * @return 鏍￠獙涔嬪悗鐨勬暟鎹�
- */
- public static byte[] FxCalculateCRC( byte[] data )
- {
- int sum = 0;
- for (int i = 1; i < data.length - 2; i++)
- {
- sum += data[i];
- }
- return BuildBytesFromData( (byte)sum );
- }
-
-
- /**
- * 妫�鏌ユ寚瀹氱殑鍜屾牎楠屾槸鍚︽槸姝ｇ‘鐨�
- * @param data 瀛楄妭鏁版嵁
- * @return 鏄惁鎴愬姛
- */
- public static boolean CheckCRC( byte[] data )
- {
- byte[] crc = FxCalculateCRC( data );
- if (crc[0] != data[data.length - 2]) return false;
- if (crc[1] != data[data.length - 1]) return false;
- return true;
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcAsciiNet.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcAsciiNet.java
deleted file mode 100644
index e0278a9..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcAsciiNet.java
+++ /dev/null
@@ -1,413 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-import com.zy.common.HslCommunication.Core.IMessage.MelsecQnA3EAsciiMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.RegularByteTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-
-/**
- * 涓夎彵PLC閫氳绫伙紝閲囩敤Qna鍏煎3E甯у崗璁疄鐜帮紝闇�瑕佸湪PLC渚у厛鐨勪互澶綉妯″潡鍏堣繘琛岄厤缃紝蹇呴』涓篈SCII閫氳鏍煎紡
- */
-public class MelsecMcAsciiNet extends NetworkDeviceBase<MelsecQnA3EAsciiMessage, RegularByteTransform> {
-
- /**
- * 瀹炰緥鍖栦笁鑿辩殑Qna鍏煎3E甯у崗璁殑閫氳瀵硅薄
- */
- public MelsecMcAsciiNet() {
- WordLength = 1;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓笁鑿辩殑Qna鍏煎3E甯у崗璁殑閫氳瀵硅薄
- * @param ipAddress PLC鐨処p鍦板潃
- * @param port PLC鐨勭鍙�
- */
- public MelsecMcAsciiNet(String ipAddress, int port) {
- WordLength = 1;
- setIpAddress(ipAddress);
- setPort(port);
- }
-
-
- private byte NetworkNumber = 0x00; // 缃戠粶鍙�
- private byte NetworkStationNumber = 0x00; // 缃戠粶绔欏彿
-
- /**
- * 鑾峰彇缃戠粶鍙�
- *
- * @return
- */
- public byte getNetworkNumber() {
- return NetworkNumber;
- }
-
- /**
- * 璁剧疆缃戠粶鍙�
- *
- * @param networkNumber
- */
- public void setNetworkNumber(byte networkNumber) {
- NetworkNumber = networkNumber;
- }
-
- /**
- * 鑾峰彇缃戠粶绔欏彿
- *
- * @return
- */
- public byte getNetworkStationNumber() {
- return NetworkStationNumber;
- }
-
- /**
- * 璁剧疆缃戠粶绔欏彿
- *
- * @param networkStationNumber
- */
- public void setNetworkStationNumber(byte networkStationNumber) {
- NetworkStationNumber = networkStationNumber;
- }
-
-
-
-
- /**
- * 浠庝笁鑿盤LC涓鍙栨兂瑕佺殑鏁版嵁锛岃繑鍥炶鍙栫粨鏋�
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"M100","D100","W1A0"
- * @param length 璇诲彇鐨勬暟鎹暱搴︼紝瀛楁渶澶у��960锛屼綅鏈�澶у��7168
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- //鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildReadCommand( address, length, NetworkNumber, NetworkStationNumber );
- if (!command.IsSuccess) return command;
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return read;
-
- // 閿欒浠ｇ爜楠岃瘉
- short errorCode = Short.parseShort(Utilities.getString(read.Content,18,4,"ASCII"), 16 );
- if (errorCode != 0) return new OperateResultExOne<>( errorCode, StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鏁版嵁瑙ｆ瀽锛岄渶瑕佷紶鍏ユ槸鍚︿娇鐢ㄤ綅鐨勫弬鏁�
- return ExtractActualData( read.Content, command.Content[29] == 0x31 );
- }
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @param length 璇诲彇鐨勯暱搴�
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadBool(String address, short length) {
- // 瑙ｆ瀽鍦板潃
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult( analysis );
-
- // 浣嶈鍙栨牎楠�
- if (analysis.Content1.getDataType() == 0x00) return new OperateResultExOne<>( StringResources.Language.MelsecReadBitInfo() );
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = Read( address, length );
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult( read );
-
- // 杞寲bool鏁扮粍
- boolean[] content = new boolean[read.Content.length];
- for (int i = 0; i < read.Content.length; i++) {
- content[i] = read.Content[i] == 0x01;
- }
- return OperateResultExOne.CreateSuccessResult( content );
- }
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadBool(String address) {
- OperateResultExOne<boolean[]> read = ReadBool(address, (short) 1);
- if (!read.IsSuccess) return OperateResultExOne.<Boolean>CreateFailedResult(read);
-
- return OperateResultExOne.<Boolean>CreateSuccessResult(read.Content[0]);
- }
-
-
- /**
- * 鍚慞LC鍐欏叆鏁版嵁锛屾暟鎹牸寮忎负鍘熷鐨勫瓧鑺傜被鍨�
- * @param address 璧峰鍦板潃
- * @param value 鍘熷鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- // 瑙ｆ瀽鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteCommand( address, value, NetworkNumber, NetworkStationNumber );
- if (!command.IsSuccess) return command;
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return read;
-
- // 閿欒鐮侀獙璇�
- short errorCode = Short.parseShort( Utilities.getString( read.Content, 18, 4 ,"ASCII"), 16 );
- if (errorCode != 0) return new OperateResultExOne<byte[]>( errorCode, StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鍐欏叆鎴愬姛
- return OperateResult.CreateSuccessResult( );
- }
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛宼rue 鎴栬�呮槸 false
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean value) {
- return Write(address, new boolean[]{value});
- }
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛屽彲浠ユ寚瀹氫换鎰忕殑闀垮害
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- byte[] buffer = new byte[values.length];
- for (int i = 0; i < values.length; i++) {
- if (values[i]) buffer[i] = 0x01;
- }
- return Write(address, buffer);
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return "MelsecMcNet";
- }
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- public static OperateResultExOne< byte[]> BuildReadCommand(String address, short length, byte networkNumber, byte networkStationNumber) {
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- // 榛樿淇℃伅----娉ㄦ剰锛氶珮浣庡瓧鑺備氦閿�
-
- try {
- byte[] _PLCCommand = new byte[42];
- _PLCCommand[0] = 0x35; // 鍓爣棰�
- _PLCCommand[1] = 0x30;
- _PLCCommand[2] = 0x30;
- _PLCCommand[3] = 0x30;
- _PLCCommand[4] = MelsecHelper.BuildBytesFromData(networkNumber)[0]; // 缃戠粶鍙�
- _PLCCommand[5] = MelsecHelper.BuildBytesFromData(networkNumber)[1];
- _PLCCommand[6] = 0x46; // PLC缂栧彿
- _PLCCommand[7] = 0x46;
- _PLCCommand[8] = 0x30; // 鐩爣妯″潡IO缂栧彿
- _PLCCommand[9] = 0x33;
- _PLCCommand[10] = 0x46;
- _PLCCommand[11] = 0x46;
- _PLCCommand[12] = MelsecHelper.BuildBytesFromData(networkStationNumber)[0]; // 鐩爣妯″潡绔欏彿
- _PLCCommand[13] = MelsecHelper.BuildBytesFromData(networkStationNumber)[1];
- _PLCCommand[14] = 0x30; // 璇锋眰鏁版嵁闀垮害
- _PLCCommand[15] = 0x30;
- _PLCCommand[16] = 0x31;
- _PLCCommand[17] = 0x38;
- _PLCCommand[18] = 0x30; // CPU鐩戣瀹氭椂鍣�
- _PLCCommand[19] = 0x30;
- _PLCCommand[20] = 0x31;
- _PLCCommand[21] = 0x30;
- _PLCCommand[22] = 0x30; // 鎵归噺璇诲彇鏁版嵁鍛戒护
- _PLCCommand[23] = 0x34;
- _PLCCommand[24] = 0x30;
- _PLCCommand[25] = 0x31;
- _PLCCommand[26] = 0x30; // 浠ョ偣涓哄崟浣嶈繕鏄瓧涓哄崟浣嶆垚鎵硅鍙�
- _PLCCommand[27] = 0x30;
- _PLCCommand[28] = 0x30;
- _PLCCommand[29] = analysis.Content1.getDataType() == 0 ? (byte) 0x30 : (byte) 0x31;
- _PLCCommand[30] = (analysis.Content1.getAsciiCode().getBytes("ASCII"))[0]; // 杞厓浠剁被鍨�
- _PLCCommand[31] = (analysis.Content1.getAsciiCode().getBytes("ASCII"))[1];
- _PLCCommand[32] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[0]; // 璧峰鍦板潃鐨勫湴浣�
- _PLCCommand[33] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[1];
- _PLCCommand[34] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[2];
- _PLCCommand[35] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[3];
- _PLCCommand[36] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[4];
- _PLCCommand[37] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[5];
- _PLCCommand[38] = MelsecHelper.BuildBytesFromData(length)[0]; // 杞厓浠剁偣鏁�
- _PLCCommand[39] = MelsecHelper.BuildBytesFromData(length)[1];
- _PLCCommand[40] = MelsecHelper.BuildBytesFromData(length)[2];
- _PLCCommand[41] = MelsecHelper.BuildBytesFromData(length)[3];
-
- return OperateResultExOne.CreateSuccessResult( _PLCCommand );
- }
- catch (Exception ex){
- return new OperateResultExOne<byte[]>(ex.getMessage());
- }
- }
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param address 璧峰鍦板潃
- * @param value 瀹為檯鐨勬暟鎹�
- * @return 鍛戒护鏁版嵁
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value, byte networkNumber, byte networkStationNumber) {
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- // 棰勫鐞嗘寚浠�
- if (analysis.Content1.getDataType() == 0x01)
- {
- // 浣嶅啓鍏�
- byte[] buffer = new byte[value.length];
- for(int i=0;i<buffer.length;i++){
- buffer[i] = value[i] == 0x00? (byte)0x30 : (byte)0x31;
- }
- value = buffer;
- }
- else
- {
- // 瀛楀啓鍏�
- byte[] buffer = new byte[value.length * 2];
- for (int i = 0; i < value.length / 2; i++)
- {
- byte[] tmp = MelsecHelper.BuildBytesFromData( Utilities.getShort( value, i * 2 ) );
- System.arraycopy(tmp,0,buffer,4*i,4);
- }
- value = buffer;
- }
-
- byte[] _PLCCommand = new byte[42 + value.length];
-
- try {
- _PLCCommand[0] = 0x35; // 鍓爣棰�
- _PLCCommand[1] = 0x30;
- _PLCCommand[2] = 0x30;
- _PLCCommand[3] = 0x30;
- _PLCCommand[4] = MelsecHelper.BuildBytesFromData(networkNumber)[0]; // 缃戠粶鍙�
- _PLCCommand[5] = MelsecHelper.BuildBytesFromData(networkNumber)[1];
- _PLCCommand[6] = 0x46; // PLC缂栧彿
- _PLCCommand[7] = 0x46;
- _PLCCommand[8] = 0x30; // 鐩爣妯″潡IO缂栧彿
- _PLCCommand[9] = 0x33;
- _PLCCommand[10] = 0x46;
- _PLCCommand[11] = 0x46;
- _PLCCommand[12] = MelsecHelper.BuildBytesFromData(networkStationNumber)[0]; // 鐩爣妯″潡绔欏彿
- _PLCCommand[13] = MelsecHelper.BuildBytesFromData(networkStationNumber)[1];
- _PLCCommand[14] = MelsecHelper.BuildBytesFromData((_PLCCommand.length - 18))[0]; // 璇锋眰鏁版嵁闀垮害
- _PLCCommand[15] = MelsecHelper.BuildBytesFromData((_PLCCommand.length - 18))[1];
- _PLCCommand[16] = MelsecHelper.BuildBytesFromData((_PLCCommand.length - 18))[2];
- _PLCCommand[17] = MelsecHelper.BuildBytesFromData((_PLCCommand.length - 18))[3];
- _PLCCommand[18] = 0x30; // CPU鐩戣瀹氭椂鍣�
- _PLCCommand[19] = 0x30;
- _PLCCommand[20] = 0x31;
- _PLCCommand[21] = 0x30;
- _PLCCommand[22] = 0x31; // 鎵归噺鍐欏叆鐨勫懡浠�
- _PLCCommand[23] = 0x34;
- _PLCCommand[24] = 0x30;
- _PLCCommand[25] = 0x31;
- _PLCCommand[26] = 0x30; // 瀛愬懡浠�
- _PLCCommand[27] = 0x30;
- _PLCCommand[28] = 0x30;
- _PLCCommand[29] = analysis.Content1.getDataType() == 0 ? (byte) 0x30 : (byte) 0x31;
- _PLCCommand[30] = (analysis.Content1.getAsciiCode().getBytes("ASCII"))[0]; // 杞厓浠剁被鍨�
- _PLCCommand[31] = (analysis.Content1.getAsciiCode().getBytes("ASCII"))[1];
- _PLCCommand[32] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[0]; // 璧峰鍦板潃鐨勫湴浣�
- _PLCCommand[33] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[1];
- _PLCCommand[34] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[2];
- _PLCCommand[35] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[3];
- _PLCCommand[36] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[4];
- _PLCCommand[37] = MelsecHelper.BuildBytesFromAddress(analysis.Content2, analysis.Content1)[5];
-
- // 鍒ゆ柇鏄惁杩涜浣嶆搷浣�
- if (analysis.Content1.getDataType() == 1) {
- _PLCCommand[38] = MelsecHelper.BuildBytesFromData( value.length)[0]; // 杞厓浠剁偣鏁�
- _PLCCommand[39] = MelsecHelper.BuildBytesFromData( value.length)[1];
- _PLCCommand[40] = MelsecHelper.BuildBytesFromData( value.length)[2];
- _PLCCommand[41] = MelsecHelper.BuildBytesFromData( value.length)[3];
- } else {
- _PLCCommand[38] = MelsecHelper.BuildBytesFromData( (value.length / 4))[0]; // 杞厓浠剁偣鏁�
- _PLCCommand[39] = MelsecHelper.BuildBytesFromData( (value.length / 4))[1];
- _PLCCommand[40] = MelsecHelper.BuildBytesFromData( (value.length / 4))[2];
- _PLCCommand[41] = MelsecHelper.BuildBytesFromData( (value.length / 4))[3];
- }
- System.arraycopy(value,0,_PLCCommand,42,value.length);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
-
- }
- catch (Exception ex){
- return new OperateResultExOne<>(ex.getMessage());
- }
- }
-
-
- /**
- * 浠嶱LC鍙嶉鐨勬暟鎹腑鎻愬彇鍑哄疄闄呯殑鏁版嵁鍐呭锛岄渶瑕佷紶鍏ュ弽棣堟暟鎹紝鏄惁浣嶈鍙�
- * @param response 鍙嶉鐨勬暟鎹唴瀹�
- * @param isBit 鏄惁浣嶈鍙�
- * @return 瑙ｆ瀽鍚庣殑缁撴灉瀵硅薄
- */
- public static OperateResultExOne<byte[]> ExtractActualData( byte[] response, boolean isBit )
- {
- if (isBit)
- {
- // 浣嶈鍙�
- byte[] Content = new byte[response.length - 22];
- for (int i = 22; i < response.length; i++)
- {
- if (response[i] == 0x30)
- {
- Content[i - 22] = 0x00;
- }
- else
- {
- Content[i - 22] = 0x01;
- }
- }
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- else
- {
- // 瀛楄鍙�
- byte[] Content = new byte[(response.length - 22) / 2];
- for (int i = 0; i < Content.length / 2; i++)
- {
- int tmp = Integer.parseInt( Utilities.getString( response, i * 4 + 22, 4 ,"ASCII"), 16 );
- byte[] buffer = Utilities.getBytes(tmp);
-
- Content[i*2+0] = buffer[0];
- Content[i*2+1] = buffer[1];
- }
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcDataType.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcDataType.java
deleted file mode 100644
index 2ac9578..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcDataType.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-
-/**
- * 涓夎彵鐨勬暟鎹被鍨�
- */
-public class MelsecMcDataType {
-
-
- /**
- * 濡傛灉鎮ㄦ竻妤氱被鍨嬩唬鍙凤紝鍙互鏍规嵁鍊艰繘琛屾墿灞�
- * @param code 鏁版嵁绫诲瀷鐨勪唬鍙�
- * @param type 0鎴�1锛岄粯璁や负0
- * @param asciiCode ASCII鏍煎紡鐨勭被鍨嬩俊鎭�
- * @param fromBase 鎸囩ず鍦板潃鐨勫灏戣繘鍒剁殑锛�10鎴栨槸16
- */
- public MelsecMcDataType( byte code, byte type, String asciiCode, int fromBase )
- {
- DataCode = code;
- AsciiCode = asciiCode;
- FromBase = fromBase;
- if (type < 2) DataType = type;
- }
-
-
-
- private byte DataCode = 0x00; // 绫诲瀷浠ｅ彿
- private byte DataType = 0x00; // 鏁版嵁绫诲瀷
- private String AsciiCode = ""; // ascii鏍煎紡閫氫俊鐨勫瓧绗�
- private int FromBase = 0; // 绫诲瀷
-
-
- /**
- * 鏁版嵁鐨勭被鍨嬩唬鍙�
- * @return
- */
- public byte getDataCode() {
- return DataCode;
- }
-
- /**
- * 瀛楄闂繕鏄綅璁块棶锛�0琛ㄧず瀛楋紝1琛ㄧず浣�
- * @return
- */
- public byte getDataType() {
- return DataType;
- }
-
- /**
- * 褰撲互ASCII鏍煎紡閫氳鏃剁殑绫诲瀷鎻忚堪
- * @return
- */
- public String getAsciiCode() {
- return AsciiCode;
- }
-
- /**
- * 鎸囩ず鍦板潃鏄�10杩涘埗锛岃繕鏄�16杩涘埗鐨�
- * @return
- */
- public int getFromBase() {
- return FromBase;
- }
-
-
- /**
- * X杈撳叆瀵勫瓨鍣�
- */
- public final static MelsecMcDataType X = new MelsecMcDataType( (byte) (0x9C), (byte) (0x01), "X*", 16 );
- /**
- * Y杈撳嚭瀵勫瓨鍣�
- */
- public final static MelsecMcDataType Y = new MelsecMcDataType( (byte) (0x9D), (byte) (0x01), "Y*", 16 );
- /**
- * M涓棿瀵勫瓨鍣�
- */
- public final static MelsecMcDataType M = new MelsecMcDataType( (byte) (0x90), (byte) (0x01), "M*", 10 );
- /**
- * D鏁版嵁瀵勫瓨鍣�
- */
- public final static MelsecMcDataType D = new MelsecMcDataType( (byte) (0xA8), (byte) (0x00), "D*", 10 );
- /**
- * W閾炬帴瀵勫瓨鍣�
- */
- public final static MelsecMcDataType W = new MelsecMcDataType( (byte) (0xB4), (byte) (0x00), "W*", 16 );
- /**
- * L閿佸瓨缁х數鍣�
- */
- public final static MelsecMcDataType L = new MelsecMcDataType( (byte) (0x92), (byte) (0x01), "L*", 10 );
- /**
- * F鎶ヨ鍣�
- */
- public final static MelsecMcDataType F = new MelsecMcDataType( (byte) (0x93), (byte) (0x01), "F*", 10 );
- /**
- * V杈规部缁х數鍣�
- */
- public final static MelsecMcDataType V = new MelsecMcDataType( (byte) (0x94), (byte) (0x01), "V*", 10 );
- /**
- * B閾炬帴缁х數鍣�
- */
- public final static MelsecMcDataType B = new MelsecMcDataType( (byte) (0xA0), (byte) (0x01), "B*", 16 );
- /**
- * R鏂囦欢瀵勫瓨鍣�
- */
- public final static MelsecMcDataType R = new MelsecMcDataType( (byte) (0xAF), (byte) (0x00), "R*", 10 );
- /**
- * S姝ヨ繘缁х數鍣�
- */
- public final static MelsecMcDataType S = new MelsecMcDataType( (byte) (0x98), (byte) (0x01), "S*", 10 );
- /**
- * 鍙樺潃瀵勫瓨鍣�
- */
- public final static MelsecMcDataType Z = new MelsecMcDataType( (byte) (0xCC), (byte) (0x00), "Z*", 10 );
- /**
- * 瀹氭椂鍣ㄧ殑鍊�
- */
- public final static MelsecMcDataType T = new MelsecMcDataType( (byte) (0xC2), (byte) (0x00), "TN", 10 );
- /**
- * 璁℃暟鍣ㄧ殑鍊�
- */
- public final static MelsecMcDataType C = new MelsecMcDataType( (byte) (0xC5), (byte) (0x00), "CN", 10 );
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcNet.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcNet.java
deleted file mode 100644
index baad50e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcNet.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Melsec;
-
-import com.zy.common.HslCommunication.Core.IMessage.MelsecQnA3EBinaryMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.RegularByteTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-/**
- * 涓夎彵鐨勫疄闄呮暟鎹氦浜掔被
- */
-public class MelsecMcNet extends NetworkDeviceBase<MelsecQnA3EBinaryMessage,RegularByteTransform> {
-
-
- /**
- * 瀹炰緥鍖栦笁鑿辩殑Qna鍏煎3E甯у崗璁殑閫氳瀵硅薄
- */
- public MelsecMcNet() {
- WordLength = 1;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓笁鑿辩殑Qna鍏煎3E甯у崗璁殑閫氳瀵硅薄
- *
- * @param ipAddress PLCd鐨処p鍦板潃
- * @param port PLC鐨勭鍙�
- */
- public MelsecMcNet(String ipAddress, int port) {
- WordLength = 1;
- super.setIpAddress(ipAddress);
- super.setPort(port);
- }
-
-
- private byte NetworkNumber = 0x00; // 缃戠粶鍙�
- private byte NetworkStationNumber = 0x00; // 缃戠粶绔欏彿
-
- /**
- * 鑾峰彇缃戠粶鍙�
- *
- * @return 缃戠粶鍙�
- */
- public byte getNetworkNumber() {
- return NetworkNumber;
- }
-
- /**
- * 璁剧疆缃戠粶鍙�
- *
- * @param networkNumber 缃戠粶鍙�
- */
- public void setNetworkNumber(byte networkNumber) {
- NetworkNumber = networkNumber;
- }
-
- /**
- * 鑾峰彇缃戠粶绔欏彿
- *
- * @return 缃戠粶绔欏彿
- */
- public byte getNetworkStationNumber() {
- return NetworkStationNumber;
- }
-
- /**
- * 璁剧疆缃戠粶绔欏彿
- *
- * @param networkStationNumber 缃戠粶绔欏彿
- */
- public void setNetworkStationNumber(byte networkStationNumber) {
- NetworkStationNumber = networkStationNumber;
- }
-
-
-
- /**
- * 浠庝笁鑿盤LC涓鍙栨兂瑕佺殑鏁版嵁锛岃繑鍥炶鍙栫粨鏋�
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"M100","D100","W1A0"
- * @param length 璇诲彇鐨勬暟鎹暱搴︼紝瀛楁渶澶у��960锛屼綅鏈�澶у��7168
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- // 鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildReadCommand( address, length, NetworkNumber, NetworkStationNumber );
- if (!command.IsSuccess) return OperateResultExOne.CreateFailedResult( command );
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult( read );
-
- // 閿欒浠ｇ爜楠岃瘉
- int errorCode = Utilities.getShort(read.Content, 9);
- if (errorCode != 0) return new OperateResultExOne<>( errorCode, StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鏁版嵁瑙ｆ瀽锛岄渶瑕佷紶鍏ユ槸鍚︿娇鐢ㄤ綅鐨勫弬鏁�
- return ExtractActualData( read.Content, command.Content[13] == 1 );
- }
-
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @param length 璇诲彇鐨勯暱搴�
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadBool(String address, short length) {
- // 瑙ｆ瀽鍦板潃
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult( analysis );
-
- // 浣嶈鍙栨牎楠�
- if (analysis.Content1.getDataType() == 0x00) return new OperateResultExOne<boolean[]>( 0, StringResources.Language.MelsecReadBitInfo() );
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = Read( address, length );
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult( read );
-
- // 杞寲bool鏁扮粍
- boolean[] result = new boolean[read.Content.length];
- for(int i=0;i<result.length;i++){
- if(read.Content[i] == 0x01) result[i] = true;
- }
- return OperateResultExOne.CreateSuccessResult( result );
- }
-
-
-
- /**
- * 浠庝笁鑿盤LC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璧峰鍦板潃
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadBool(String address) {
- OperateResultExOne<boolean[]> read = ReadBool(address, (short) 1);
- if (!read.IsSuccess) return OperateResultExOne.CreateFailedResult(read);
-
- return OperateResultExOne.CreateSuccessResult(read.Content[0]);
- }
-
-
-
-
-
- /**
- * 鍚慞LC鍐欏叆鏁版嵁锛屾暟鎹牸寮忎负鍘熷鐨勫瓧鑺傜被鍨�
- * @param address 璧峰鍦板潃
- * @param value 鍘熷鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- // 瑙ｆ瀽鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteCommand( address, value, NetworkNumber, NetworkStationNumber );
- if (!command.IsSuccess) return command;
-
- // 鏍稿績浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer( command.Content );
- if (!read.IsSuccess) return read;
-
- // 閿欒鐮佹牎楠�
- short ErrorCode = Utilities.getShort(read.Content, 9);
- if (ErrorCode != 0) return new OperateResultExOne<byte[]>( ErrorCode, StringResources.Language.MelsecPleaseReferToManulDocument() );
-
- // 鎴愬姛
- return OperateResult.CreateSuccessResult( );
- }
-
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean value) {
- return Write(address, new boolean[]{value});
- }
-
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲M100
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛屽彲浠ユ寚瀹氫换鎰忕殑闀垮害
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- byte[] buffer = new byte[values.length];
- for (int i = 0; i < values.length; i++) {
- buffer[i] = values[i] ? (byte) 0x01 : (byte) 0x00;
- }
- return Write(address, buffer);
- }
-
-
- /**
- * 鑾峰彇褰撳墠瀵硅薄鐨勫瓧绗︿覆鏍囪瘑褰㈠紡
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString() {
- return "MelsecMcNet";
- }
-
-
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(String address, short length) {
- return BuildReadCommand(address,length,(byte) 0,(byte)0);
- }
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @param networkNumber 缃戠粶鍙�
- * @param networkStationNumber 缃戠粶绔欏彿
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(String address, short length, byte networkNumber, byte networkStationNumber) {
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- byte[] _PLCCommand = new byte[21];
- _PLCCommand[0] = 0x50; // 鍓爣棰�
- _PLCCommand[1] = 0x00;
- _PLCCommand[2] = networkNumber; // 缃戠粶鍙�
- _PLCCommand[3] = (byte) (0xFF); // PLC缂栧彿
- _PLCCommand[4] = (byte) (0xFF);
- _PLCCommand[5] = 0x03;
- _PLCCommand[6] = networkStationNumber; // 鐩爣妯″潡绔欏彿
- _PLCCommand[7] = 0x0C; // 璇锋眰鏁版嵁闀垮害
- _PLCCommand[8] = 0x00;
- _PLCCommand[9] = 0x0A; // CPU鐩戣瀹氭椂鍣�
- _PLCCommand[10] = 0x00;
- _PLCCommand[11] = 0x01; // 鎵归噺璇诲彇鏁版嵁鍛戒护
- _PLCCommand[12] = 0x04;
- _PLCCommand[13] = analysis.Content1.getDataType(); // 浠ョ偣涓哄崟浣嶈繕鏄瓧涓哄崟浣嶆垚鎵硅鍙�
- _PLCCommand[14] = 0x00;
- _PLCCommand[15] = (byte) (analysis.Content2 % 256); // 璧峰鍦板潃鐨勫湴浣�
- _PLCCommand[16] = (byte) (analysis.Content2 / 256);
- _PLCCommand[17] = 0x00;
- _PLCCommand[18] = analysis.Content1.getDataCode(); // 鎸囨槑璇诲彇鐨勬暟鎹�
- _PLCCommand[19] = (byte) (length % 256); // 杞厓浠堕暱搴︾殑鍦颁綅
- _PLCCommand[20] = (byte) (length / 256);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param address 璧峰鍦板潃
- * @param value 鍊�
- * @return 缁撴灉
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value) {
- return BuildWriteCommand(address,value,(byte)0,(byte)0);
- }
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param address 璧峰鍦板潃
- * @param value 鍊�
- * @param networkNumber 缃戠粶鍙�
- * @param networkStationNumber 缃戠粶绔欏彿
- * @return 缁撴灉
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value, byte networkNumber, byte networkStationNumber) {
- OperateResultExTwo<MelsecMcDataType, Short> analysis = MelsecHelper.McAnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- int length = -1;
- if (analysis.Content1.getDataType() == 1)
- {
- // 鎸夌収浣嶅啓鍏ョ殑鎿嶄綔锛屾暟鎹渶瑕侀噸鏂拌绠�
- length = value.length;
- value = MelsecHelper.TransBoolArrayToByteData( value );
- }
-
- byte[] _PLCCommand = new byte[21 + value.length];
- _PLCCommand[0] = 0x50; // 鍓爣棰�
- _PLCCommand[1] = 0x00;
- _PLCCommand[2] = networkNumber; // 缃戠粶鍙�
- _PLCCommand[3] = (byte) (0xFF); // PLC缂栧彿
- _PLCCommand[4] = (byte) (0xFF); // 鐩爣妯″潡IO缂栧彿
- _PLCCommand[5] = 0x03;
- _PLCCommand[6] = networkStationNumber; // 鐩爣妯″潡绔欏彿
-
- _PLCCommand[7] = (byte) ((_PLCCommand.length - 9) % 256); // 璇锋眰鏁版嵁闀垮害
- _PLCCommand[8] = (byte) ((_PLCCommand.length - 9) / 256);
- ;
- _PLCCommand[9] = 0x0A; // CPU鐩戣瀹氭椂鍣�
- _PLCCommand[10] = 0x00;
- _PLCCommand[11] = 0x01; // 鎵归噺璇诲彇鏁版嵁鍛戒护
- _PLCCommand[12] = 0x14;
- _PLCCommand[13] = analysis.Content1.getDataType(); // 浠ョ偣涓哄崟浣嶈繕鏄瓧涓哄崟浣嶆垚鎵硅鍙�
- _PLCCommand[14] = 0x00;
- _PLCCommand[15] = (byte) (analysis.Content2 % 256);
- ; // 璧峰鍦板潃鐨勫湴浣�
- _PLCCommand[16] = (byte) (analysis.Content2 / 256);
- _PLCCommand[17] = 0x00;
- _PLCCommand[18] = analysis.Content1.getDataCode(); // 鎸囨槑鍐欏叆鐨勬暟鎹�
-
- // 鍒ゆ柇鏄惁杩涜浣嶆搷浣�
- if (analysis.Content1.getDataType() == 1) {
- if (length > 0) {
- _PLCCommand[19] = (byte) (length % 256); // 杞厓浠堕暱搴︾殑鍦颁綅
- _PLCCommand[20] = (byte) (length / 256);
- } else {
- _PLCCommand[19] = (byte) (value.length * 2 % 256); // 杞厓浠堕暱搴︾殑鍦颁綅
- _PLCCommand[20] = (byte) (value.length * 2 / 256);
- }
- } else {
- _PLCCommand[19] = (byte) (value.length / 2 % 256); // 杞厓浠堕暱搴︾殑鍦颁綅
- _PLCCommand[20] = (byte) (value.length / 2 / 256);
- }
-
- System.arraycopy(value, 0, _PLCCommand, 21, value.length);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 浠嶱LC鍙嶉鐨勬暟鎹腑鎻愬彇鍑哄疄闄呯殑鏁版嵁鍐呭锛岄渶瑕佷紶鍏ュ弽棣堟暟鎹紝鏄惁浣嶈鍙�
- * @param response 鍙嶉鐨勬暟鎹唴瀹�
- * @param isBit 鏄惁浣嶈鍙�
- * @return 瑙ｆ瀽鍚庣殑缁撴灉瀵硅薄
- */
- public static OperateResultExOne<byte[]> ExtractActualData( byte[] response, boolean isBit )
- {
- if (isBit)
- {
- // 浣嶈鍙�
- byte[] Content = new byte[(response.length - 11) * 2];
- for (int i = 11; i < response.length; i++)
- {
- if ((response[i] & 0x10) == 0x10)
- {
- Content[(i - 11) * 2 + 0] = 0x01;
- }
-
- if ((response[i] & 0x01) == 0x01)
- {
- Content[(i - 11) * 2 + 1] = 0x01;
- }
- }
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- else
- {
- // 瀛楄鍙�
- byte[] Content = new byte[response.length - 11];
- System.arraycopy(response,11,Content,0,Content.length);
-
- return OperateResultExOne.CreateSuccessResult( Content );
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsDataType.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsDataType.java
deleted file mode 100644
index a700693..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsDataType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Omron;
-
-/**
- * 娆у榫欑殑Fins鍗忚鐨勬暟鎹被鍨�
- */
-public class OmronFinsDataType
-{
- /**
- * 瀹炰緥鍖栦竴涓狥ins鐨勬暟鎹被鍨�
- * @param bitCode 浣嶆搷浣滅殑鎸囦护
- * @param wordCode 瀛楁搷浣滅殑鎸囦护
- */
- public OmronFinsDataType( byte bitCode, byte wordCode )
- {
- BitCode = bitCode;
- WordCode = wordCode;
-
- }
-
- /**
- * 鑾峰彇杩涜浣嶆搷浣滅殑鎸囦护
- * @return
- */
- public byte getBitCode() {
- return BitCode;
- }
-
- /**
- * 杩涜瀛楁搷浣滅殑鎸囦护
- * @return
- */
- public byte getWordCode() {
- return WordCode;
- }
-
-
- private byte BitCode = 0;
- private byte WordCode = 0;
-
-
-
- /**
- * DM Area
- */
- public static final OmronFinsDataType DM = new OmronFinsDataType( (byte) 0x02, (byte) 0x82 );
-
- /**
- * CIO Area
- */
- public static final OmronFinsDataType CIO = new OmronFinsDataType( (byte)0x30, (byte)0xB0 );
-
- /**
- * Work Area
- */
- public static final OmronFinsDataType WR = new OmronFinsDataType( (byte)0x31, (byte)0xB1 );
-
- /**
- * Holding Bit Area
- */
- public static final OmronFinsDataType HR = new OmronFinsDataType( (byte)0x32, (byte)0xB2 );
-
- /**
- * Auxiliary Bit Area
- */
- public static final OmronFinsDataType AR = new OmronFinsDataType( (byte)0x33, (byte)0xB3 );
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsNet.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsNet.java
deleted file mode 100644
index 486f415..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsNet.java
+++ /dev/null
@@ -1,529 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Omron;
-
-import com.zy.common.HslCommunication.Core.IMessage.FinsMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.ReverseWordTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.net.Socket;
-
-/**
- * 娆у榫橣ins甯у崗璁�氳绫�
- */
-public class OmronFinsNet extends NetworkDeviceBase<FinsMessage,ReverseWordTransform> {
- /**
- * 瀹炰緥鍖栦竴涓濮嗛緳Fins甯у崗璁殑閫氳瀵硅薄
- */
- public OmronFinsNet() {
- WordLength = 1;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓濮嗛緳Fins甯у崗璁殑閫氳瀵硅薄
- * @param ipAddress PLCd鐨処p鍦板潃
- * @param port PLC鐨勭鍙�
- */
- public OmronFinsNet(String ipAddress, int port) {
- WordLength = 1;
- setIpAddress(ipAddress);
- setPort(port);
- }
-
-
- /**
- * 淇℃伅鎺у埗瀛楁锛岄粯璁�0x80
- */
- public byte ICF = (byte) 0x80;
-
- /**
- * 绯荤粺浣跨敤鐨勫唴閮ㄤ俊鎭�
- */
- public byte RSV = 0x00;
-
- /**
- * 缃戠粶灞備俊鎭紝榛樿0x02锛屽鏋滄湁鍏眰娑堟伅锛屽氨璁剧疆涓�0x07
- */
- public byte GCT = 0x02;
-
- /**
- * PLC鐨勭綉缁滃彿鍦板潃锛岄粯璁�0x00
- */
- public byte DNA = 0x00;
-
-
- /**
- * PLC鐨勮妭鐐瑰湴鍧�锛岄粯璁�0x13
- */
- public byte DA1 = 0x13;
-
- /**
- * PLC鐨勫崟鍏冨彿鍦板潃
- */
- public byte DA2 = 0x00;
-
- /**
- * 涓婁綅鏈虹殑缃戠粶鍙峰湴鍧�
- */
- public byte SNA = 0x00;
-
-
- private byte computerSA1 = 0x0B;
-
- /**
- * 涓婁綅鏈虹殑鑺傜偣鍦板潃锛岄粯璁�0x0B
- *
- * @return byte鏁版嵁
- */
- public byte getSA1() {
- return computerSA1;
- }
-
- /**
- * 璁剧疆涓婁綅鏈虹殑鑺傜偣鍦板潃锛岄粯璁�0x0B
- *
- * @param computerSA1
- */
- public void setSA1(byte computerSA1) {
- this.computerSA1 = computerSA1;
- handSingle[19] = computerSA1;
- }
-
-
- /**
- * 涓婁綅鏈虹殑鍗曞厓鍙峰湴鍧�
- */
- public byte SA2 = 0x00;
-
- /**
- * 璁惧鐨勬爣璇嗗彿
- */
- public byte SID = 0x00;
-
-
-
- /**
- * 灏嗘櫘閫氱殑鎸囦护鎵撳寘鎴愬畬鏁寸殑鎸囦护
- * @param cmd 鎸囦护
- * @return 瀛楄妭
- */
- private byte[] PackCommand(byte[] cmd) {
- byte[] buffer = new byte[26 + cmd.length];
- System.arraycopy(handSingle, 0, buffer, 0, 4);
-
- byte[] tmp = Utilities.getBytes(buffer.length - 8);
- Utilities.bytesReverse(tmp); // 缈昏浆鏁扮粍
-
- System.arraycopy(tmp, 0, buffer, 4, tmp.length);
- buffer[11] = 0x02;
-
- buffer[16] = ICF;
- buffer[17] = RSV;
- buffer[18] = GCT;
- buffer[19] = DNA;
- buffer[20] = DA1;
- buffer[21] = DA2;
- buffer[22] = SNA;
- buffer[23] = getSA1();
- buffer[24] = SA2;
- buffer[25] = SID;
- System.arraycopy(cmd, 0, buffer, 26, cmd.length);
-
- return buffer;
- }
-
-
-
- /**
- * 鏍规嵁绫诲瀷鍦板潃闀垮害纭闇�瑕佽鍙栫殑鎸囦护澶�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @param isBit 鏄惁鏄綅璇诲彇
- * @return 甯︽湁鎴愬姛鏍囧織鐨勬寚浠ゆ暟鎹�
- */
- private OperateResultExOne<byte[]> BuildReadCommand(String address, int length, boolean isBit) {
- OperateResultExTwo<OmronFinsDataType, byte[]> analysis = AnalysisAddress(address, isBit);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- byte[] _PLCCommand = new byte[8];
- _PLCCommand[0] = 0x01;
- _PLCCommand[1] = 0x01;
- if (isBit) {
- _PLCCommand[2] = analysis.Content1.getBitCode();
- } else {
- _PLCCommand[2] = analysis.Content1.getWordCode();
- }
-
- System.arraycopy(analysis.Content2, 0, _PLCCommand, 3, analysis.Content2.length);
- _PLCCommand[6] = (byte) (length / 256);
- _PLCCommand[7] = (byte) (length % 256);
-
- return OperateResultExOne.CreateSuccessResult( PackCommand( _PLCCommand ) );
- }
-
-
- /**
- *
- * @param address 鏍规嵁绫诲瀷鍦板潃浠ュ強闇�瑕佸啓鍏ョ殑鏁版嵁鏉ョ敓鎴愭寚浠ゅご
- * @param value 璧峰鍦板潃
- * @param isBit 鏄惁鏄綅鎿嶄綔
- * @return 缁撴灉
- */
- private OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] value, boolean isBit) {
- OperateResultExTwo<OmronFinsDataType, byte[]> analysis = AnalysisAddress(address, isBit);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- byte[] _PLCCommand = new byte[8 + value.length];
- _PLCCommand[0] = 0x01; // 璇诲彇瀛樺偍鍖烘暟鎹�
- _PLCCommand[1] = 0x02;
- if (isBit) {
- _PLCCommand[2] = analysis.Content1.getBitCode();
- } else {
- _PLCCommand[2] = analysis.Content1.getWordCode();
- }
-
- System.arraycopy(analysis.Content2, 0, _PLCCommand, 3, analysis.Content2.length);
-
- if (isBit) {
- _PLCCommand[6] = (byte) (value.length / 256);
- _PLCCommand[7] = (byte) (value.length % 256);
- } else {
- _PLCCommand[6] = (byte) (value.length / 2 / 256);
- _PLCCommand[7] = (byte) (value.length / 2 % 256);
- }
-
- System.arraycopy(value, 0, _PLCCommand, 8, value.length);
-
- return OperateResultExOne.CreateSuccessResult( PackCommand( _PLCCommand ) );
- }
-
-
- /**
- * 鍦ㄨ繛鎺ヤ笂娆у榫橮LC鍚庯紝闇�瑕佽繘琛屼竴姝ユ彙鎵嬪崗璁�
- * @param socket 缃戠粶濂楁帴瀛�
- * @return 缁撴灉瀵硅薄
- */
- @Override
- protected OperateResult InitializationOnConnect(Socket socket) {
- // handSingle灏辨槸鎻℃墜淇″彿瀛楄妭
- OperateResultExTwo<byte[], byte[]> read = ReadFromCoreServerBase(socket, handSingle);
- if (!read.IsSuccess) return read;
-
- // 妫�鏌ヨ繑鍥炵殑鐘舵��
- byte[] buffer = new byte[4];
- buffer[0] = read.Content2[7];
- buffer[1] = read.Content2[6];
- buffer[2] = read.Content2[5];
- buffer[3] = read.Content2[4];
- int status = Utilities.getInt(buffer, 0);
- if (status != 0) return new OperateResult( status, GetStatusDescription( status ) );
-
- // 鎻愬彇PLC鐨勮妭鐐瑰湴鍧�
- if (read.Content2.length >= 16) DA1 = read.Content2[15];
-
- return OperateResult.CreateSuccessResult();
- }
-
-
- /**
- * 浠庢濮嗛緳PLC涓鍙栨兂瑕佺殑鏁版嵁锛岃繑鍥炶鍙栫粨鏋滐紝璇诲彇鍗曚綅涓哄瓧
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"D100","C100","W100","H100","A100"
- * @param length 璇诲彇鐨勬暟鎹暱搴︼紝瀛楁渶澶у��960锛屼綅鏈�澶у��7168
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- //鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildReadCommand(address, length, false);
- if (!command.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(command);
-
- // 鏍稿績鏁版嵁浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(read);
-
- // 鏁版嵁鏈夋晥鎬у垎鏋�
- OperateResultExOne<byte[]> valid = ResponseValidAnalysis(read.Content, true);
- if (!valid.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(valid);
-
- // 璇诲彇鍒颁簡姝ｇ‘鐨勬暟鎹�
- return OperateResultExOne.CreateSuccessResult(valid.Content);
- }
-
-
-
- /**
- * 浠庢濮嗛緳PLC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"D100","C100","W100","H100","A100"
- * @param length 璇诲彇鐨勯暱搴�
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<boolean[]> ReadBool(String address, short length) {
- //鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildReadCommand(address, length, true);
- if (!command.IsSuccess) return OperateResultExOne.<boolean[]>CreateFailedResult(command);
-
- // 鏍稿績鏁版嵁浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return OperateResultExOne.<boolean[]>CreateFailedResult(read);
-
- // 鏁版嵁鏈夋晥鎬у垎鏋�
- OperateResultExOne<byte[]> valid = ResponseValidAnalysis(read.Content, true);
- if (!valid.IsSuccess) return OperateResultExOne.<boolean[]>CreateFailedResult(valid);
-
- // 杩斿洖姝ｇ‘鐨勬暟鎹俊鎭�
- boolean[] buffer = new boolean[valid.Content.length];
- for (int i = 0; i < valid.Content.length; i++) {
- buffer[i] = valid.Content[i] != 0x00;
- }
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
-
- /**
- * 浠庢濮嗛緳PLC涓壒閲忚鍙栦綅杞厓浠讹紝杩斿洖璇诲彇缁撴灉
- * @param address 璇诲彇鍦板潃锛屾牸寮忎负"D100.0","C100.15","W100.7","H100.4","A100.9"
- * @return 甯︽垚鍔熸爣蹇楃殑缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<Boolean> ReadBool(String address) {
- OperateResultExOne<boolean[]> read = ReadBool(address, (short) 1);
- if (read.IsSuccess) {
- return OperateResultExOne.CreateSuccessResult(read.Content[0]);
- } else {
- return OperateResultExOne.<Boolean>CreateFailedResult(read);
- }
- }
-
- /**
- * 鍚慞LC鍐欏叆鏁版嵁锛屾暟鎹牸寮忎负鍘熷鐨勫瓧鑺傜被鍨�
- * @param address 璧峰鍦板潃
- * @param value 鍘熷鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- //鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteCommand(address, value, false);
- if (!command.IsSuccess) return command;
-
- // 鏍稿績鏁版嵁浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return read;
-
- // 鏁版嵁鏈夋晥鎬у垎鏋�
- OperateResultExOne<byte[]> valid = ResponseValidAnalysis(read.Content, false);
- if (!valid.IsSuccess) return valid;
-
- // 鎴愬姛
- return OperateResult.CreateSuccessResult();
- }
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲D100.0
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean value) {
- return Write(address, new boolean[]{value});
- }
-
-
- /**
- * 鍚慞LC涓綅杞厓浠跺啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,values[0]瀵瑰簲D100.0
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛屽彲浠ユ寚瀹氫换鎰忕殑闀垮害
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- OperateResult result = new OperateResult();
-
- byte[] buffer = new byte[values.length];
- for (int i = 0; i < buffer.length; i++) {
- buffer[i] = values[i] ? (byte) 0x01 : (byte) 0x00;
- }
-
- // 鑾峰彇鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteCommand(address, buffer, true);
- if (!command.IsSuccess) return command;
-
- // 鏍稿績鏁版嵁浜や簰
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return read;
-
- // 鏁版嵁鏈夋晥鎬у垎鏋�
- OperateResultExOne<byte[]> valid = ResponseValidAnalysis(read.Content, false);
- if (!valid.IsSuccess) return valid;
-
- // 鍐欏叆鎴愬姛
- return OperateResult.CreateSuccessResult();
- }
-
-
- // 鎻℃墜淇″彿
- // 46494E530000000C0000000000000000000000D6
- private final byte[] handSingle = new byte[]
- {
- 0x46, 0x49, 0x4E, 0x53, // FINS
- 0x00, 0x00, 0x00, 0x0C, // 鍚庨潰鐨勫懡浠ら暱搴�
- 0x00, 0x00, 0x00, 0x00, // 鍛戒护鐮�
- 0x00, 0x00, 0x00, 0x00, // 閿欒鐮�
- 0x00, 0x00, 0x00, 0x01 // 鑺傜偣鍙�
- };
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- *
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return "OmronFinsNet";
- }
-
-
-
-
- /**
- * 瑙ｆ瀽鏁版嵁鍦板潃锛孫mron鎵嬪唽绗�188椤�
- * @param address 鏁版嵁鍦板潃
- * @param isBit 鏄惁鏄綅鍦板潃
- * @return 缁撴灉绫诲璞�
- */
- public static OperateResultExTwo<OmronFinsDataType, byte[]> AnalysisAddress(String address, boolean isBit) {
- OperateResultExTwo<OmronFinsDataType, byte[]> result = new OperateResultExTwo<OmronFinsDataType, byte[]>();
- try {
- switch (address.charAt(0)) {
- case 'D':
- case 'd': {
- // DM鍖烘暟鎹�
- result.Content1 = OmronFinsDataType.DM;
- break;
- }
- case 'C':
- case 'c': {
- // CIO鍖烘暟鎹�
- result.Content1 = OmronFinsDataType.CIO;
- break;
- }
- case 'W':
- case 'w': {
- // WR鍖�
- result.Content1 = OmronFinsDataType.WR;
- break;
- }
- case 'H':
- case 'h': {
- // HR鍖�
- result.Content1 = OmronFinsDataType.HR;
- break;
- }
- case 'A':
- case 'a': {
- // AR鍖�
- result.Content1 = OmronFinsDataType.AR;
- break;
- }
- default:
- throw new Exception(StringResources.Language.NotSupportedDataType());
- }
-
- if (isBit) {
- // 浣嶆搷浣�
- String[] splits = address.substring(1).split("\\.");
- int addr = Integer.parseInt(splits[0]);
- result.Content2 = new byte[3];
- result.Content2[0] = Utilities.getBytes(addr)[1];
- result.Content2[1] = Utilities.getBytes(addr)[0];
-
- if (splits.length > 1) {
- result.Content2[2] = Byte.parseByte(splits[1]);
- if (result.Content2[2] > 15) {
- throw new Exception(StringResources.Language.OmronAddressMustBeZeroToFiveteen());
- }
- }
- } else {
- // 瀛楁搷浣�
- int addr = Integer.parseInt(address.substring(1));
- result.Content2 = new byte[3];
- result.Content2[0] = Utilities.getBytes(addr)[1];
- result.Content2[1] = Utilities.getBytes(addr)[0];
- }
- } catch (Exception ex) {
- result.Message = ex.getMessage();
- return result;
- }
-
- result.IsSuccess = true;
- return result;
- }
-
- /**
- * 瀵逛簬PLC鐨勫弽棣堟暟鎹紝杩涜楠岃瘉
- * @param response PLC鍙嶉鏁版嵁
- * @param isRead 鏄惁澶勪簬璇诲彇鐘舵��
- * @return 鎴愬姛鐨勬暟鎹粨鏋�
- */
- public static OperateResultExOne<byte[]> ResponseValidAnalysis(byte[] response, boolean isRead) {
- // 鏁版嵁鏈夋晥鎬у垎鏋�
- if (response.length >= 16) {
- // 鎻愬彇閿欒鐮�
- byte[] buffer = new byte[4];
- buffer[0] = response[15];
- buffer[1] = response[14];
- buffer[2] = response[13];
- buffer[3] = response[12];
-
- int err = Utilities.getInt(buffer, 0);
- if (err > 0) return new OperateResultExOne<byte[]>(err, GetStatusDescription(err));
-
- if (response.length >= 30) {
- err = response[28] * 256 + response[29];
- if (err > 0) return new OperateResultExOne<byte[]>(err,StringResources.Language.OmronReceiveDataError());
-
- if (!isRead) {
- // 鍐欏叆鎿嶄綔
- return OperateResultExOne.CreateSuccessResult(new byte[0]);
- } else {
- // 璇诲彇鎿嶄綔
- byte[] content = new byte[response.length - 30];
- if (content.length > 0) {
- System.arraycopy(response, 30, content, 0, content.length);
- }
- return OperateResultExOne.CreateSuccessResult(content);
- }
- }
- }
-
- return new OperateResultExOne<byte[]>( StringResources.Language.OmronReceiveDataError() );
- }
-
- /**
- * 鑾峰彇閿欒淇℃伅鐨勫瓧绗︿覆鎻忚堪鏂囨湰
- * @param err 閿欒鐮�
- * @return 鏂囨湰鎻忚堪
- */
- public static String GetStatusDescription( int err )
- {
- switch (err)
- {
- case 0: return StringResources.Language.OmronStatus0();
- case 1: return StringResources.Language.OmronStatus1();
- case 2: return StringResources.Language.OmronStatus2();
- case 3: return StringResources.Language.OmronStatus3();
- case 20: return StringResources.Language.OmronStatus20();
- case 21: return StringResources.Language.OmronStatus21();
- case 22: return StringResources.Language.OmronStatus22();
- case 23: return StringResources.Language.OmronStatus23();
- case 24: return StringResources.Language.OmronStatus24();
- case 25: return StringResources.Language.OmronStatus25();
- default: return StringResources.Language.UnknownError();
- }
- }
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensFetchWriteNet.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensFetchWriteNet.java
deleted file mode 100644
index d1c787c..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensFetchWriteNet.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Siemens;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.IMessage.FetchWriteMessage;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.ReverseBytesTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExThree;
-import com.zy.common.HslCommunication.StringResources;
-
-/**
- * 浣跨敤浜咶etch/Write鍗忚鏉ュ拰瑗块棬瀛愯繘琛岄�氳锛岃绉嶆柟娉曢渶瑕佸湪PLC渚ц繘琛屼竴浜涢厤缃�
- */
-public class SiemensFetchWriteNet extends NetworkDeviceBase<FetchWriteMessage, ReverseBytesTransform> {
-
- /**
- * 瀹炰緥鍖栦竴涓タ闂ㄥ瓙鐨凢etch/Write鍗忚鐨勯�氳瀵硅薄
- */
- public SiemensFetchWriteNet() {
- WordLength = 2;
- }
-
-
- /**
- * 瀹炰緥鍖栦竴涓タ闂ㄥ瓙鐨凢etch/Write鍗忚鐨勯�氳瀵硅薄
- *
- * @param ipAddress PLC鐨処p鍦板潃
- * @param port PLC鐨勭鍙�
- */
- public SiemensFetchWriteNet(String ipAddress, int port) {
- WordLength = 2;
- setIpAddress(ipAddress);
- setPort(port);
- }
-
-
- /**
- * 浠嶱LC璇诲彇鏁版嵁锛屽湴鍧�鏍煎紡涓篒100锛孮100锛孌B20.100锛孧100锛孴100锛孋100锛屼互瀛楄妭涓哄崟浣�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100锛孴100锛孋100
- * @param length 璇诲彇鐨勬暟閲忥紝浠ュ瓧鑺備负鍗曚綅
- * @return 甯︽湁鎴愬姛鏍囧織鐨勫瓧鑺備俊鎭�
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
- OperateResultExOne<byte[]> command = BuildReadCommand(address, length);
- if (!command.IsSuccess) {
- result.CopyErrorFromOther(command);
- return result;
- }
-
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (read.IsSuccess) {
- if (read.Content[8] == 0x00) {
- // 鍒嗘瀽缁撴灉
- byte[] buffer = new byte[read.Content.length - 16];
- System.arraycopy(read.Content, 16, buffer, 0, buffer.length);
-
- result.Content = buffer;
- result.IsSuccess = true;
- } else {
- result.ErrorCode = read.Content[8];
- result.Message = "鍙戠敓浜嗗紓甯革紝鍏蜂綋淇℃伅鏌ユ壘Fetch/Write鍗忚鏂囨。";
- }
- } else {
- result.ErrorCode = read.ErrorCode;
- result.Message = read.Message;
- }
-
- return result;
- }
-
-
- /**
- * 璇诲彇鎸囧畾鍦板潃鐨刡yte鏁版嵁
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResultExOne<Byte> ReadByte(String address) {
- return GetByteResultFromBytes(Read(address, (short) 1));
- }
-
-
- /**
- * 灏嗘暟鎹啓鍏ュ埌PLC鏁版嵁锛屽湴鍧�鏍煎紡涓篒100锛孮100锛孌B20.100锛孧100锛屼互瀛楄妭涓哄崟浣�
- *
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @param value 鍐欏叆鐨勬暟鎹紝闀垮害鏍规嵁data鐨勯暱搴︽潵鎸囩ず
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- OperateResult result = new OperateResult();
-
- OperateResultExOne<byte[]> command = BuildWriteCommand(address, value);
- if (!command.IsSuccess) {
- result.CopyErrorFromOther(command);
- return result;
- }
-
-
- OperateResultExOne<byte[]> write = ReadFromCoreServer(command.Content);
- if (write.IsSuccess) {
- if (write.Content[8] != 0x00) {
- // 鍐欏叆寮傚父
- result.Message = "鍐欏叆鏁版嵁寮傚父锛屼唬鍙蜂负锛�" + String.valueOf(write.Content[8]);
- } else {
- result.IsSuccess = true; // 鍐欏叆鎴愬姛
- }
- } else {
- result.ErrorCode = write.ErrorCode;
- result.Message = write.Message;
- }
- return result;
- }
-
- /**
- * 鍚慞LC涓啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,閭ｄ箞data[0]瀵瑰簲M100.0
- *
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- return Write(address, SoftBasic.BoolArrayToByte(values));
- }
-
-
- /**
- * 鍚慞LC涓啓鍏yte鏁版嵁锛岃繑鍥炲�艰鏄�
- *
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁
- * @return 杩斿洖鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, byte value) {
- return Write(address, new byte[]{value});
- }
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- *
- * @return 瀛楃涓�
- */
- @Override
- public String toString() {
- return "SiemensFetchWriteNet";
- }
-
-
-
-
- /**
- * 璁＄畻鐗规畩鐨勫湴鍧�淇℃伅
- *
- * @param address 瀛楃涓蹭俊鎭�
- * @return 瀹為檯鍊�
- */
- public static int CalculateAddressStarted(String address) {
- if (address.indexOf('.') < 0) {
- return Integer.parseInt(address);
- } else {
- String[] temp = address.split("\\.");
- return Integer.parseInt(temp[0]);
- }
- }
-
-
- /**
- * 瑙ｆ瀽鏁版嵁鍦板潃锛岃В鏋愬嚭鍦板潃绫诲瀷锛岃捣濮嬪湴鍧�锛孌B鍧楃殑鍦板潃
- *
- * @param address 鏁版嵁鍦板潃
- * @return 瑙ｆ瀽鍑哄湴鍧�绫诲瀷锛岃捣濮嬪湴鍧�锛孌B鍧楃殑鍦板潃
- */
- public static OperateResultExThree<Byte, Integer, Integer> AnalysisAddress(String address) {
- OperateResultExThree<Byte, Integer, Integer> result = new OperateResultExThree<Byte, Integer, Integer>();
- try {
- result.Content3 = 0;
- if (address.indexOf(0) == 'I') {
- result.Content1 = 0x03;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.indexOf(0) == 'Q') {
- result.Content1 = 0x04;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.indexOf(0) == 'M') {
- result.Content1 = 0x02;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.indexOf(0) == 'D' || address.substring(0, 2).equals("DB")) {
- result.Content1 = 0x01;
- String[] adds = address.split("\\.");
- if (address.indexOf(1) == 'B') {
- result.Content3 = Integer.parseInt(adds[0].substring(2));
- } else {
- result.Content3 = Integer.parseInt(adds[0].substring(1));
- }
-
- if (result.Content3 > 255) {
- result.Message = StringResources.Language.SiemensDBAddressNotAllowedLargerThan255();
- return result;
- }
-
- result.Content2 = CalculateAddressStarted(address.substring(address.indexOf('.') + 1));
- } else if (address.indexOf(0) == 'T') {
- result.Content1 = 0x07;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.indexOf(0) == 'C') {
- result.Content1 = 0x06;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else {
- return new OperateResultExThree<Byte, Integer, Integer>(StringResources.Language.NotSupportedDataType());
- }
- } catch (Exception ex) {
- result.Message = ex.getMessage();
- return result;
- }
-
- result.IsSuccess = true;
- return result;
- }
-
-
- /**
- * 鐢熸垚涓�涓鍙栧瓧鏁版嵁鎸囦护澶寸殑閫氱敤鏂规硶
- *
- * @param address 鍦板潃
- * @param count 闀垮害
- * @return 甯︾粨鏋滄爣璇嗙殑鎸囦护
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(String address, int count) {
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
- byte[] _PLCCommand = new byte[16];
- _PLCCommand[0] = 0x53;
- _PLCCommand[1] = 0x35;
- _PLCCommand[2] = 0x10;
- _PLCCommand[3] = 0x01;
- _PLCCommand[4] = 0x03;
- _PLCCommand[5] = 0x05;
- _PLCCommand[6] = 0x03;
- _PLCCommand[7] = 0x08;
-
- // 鎸囧畾鏁版嵁鍖�
- _PLCCommand[8] = analysis.Content1;
- _PLCCommand[9] = analysis.Content3.byteValue();
-
- // 鎸囧畾鏁版嵁鍦板潃
- _PLCCommand[10] = (byte) (analysis.Content2 / 256);
- _PLCCommand[11] = (byte) (analysis.Content2 % 256);
-
- if (analysis.Content1 == 0x01 || analysis.Content1 == 0x06 || analysis.Content1 == 0x07) {
- if (count % 2 != 0) {
- return new OperateResultExOne<byte[]>(StringResources.Language.SiemensReadLengthMustBeEvenNumber());
- } else {
- // 鎸囧畾鏁版嵁闀垮害
- _PLCCommand[12] = (byte) (count / 2 / 256);
- _PLCCommand[13] = (byte) (count / 2 % 256);
- }
- } else {
- // 鎸囧畾鏁版嵁闀垮害
- _PLCCommand[12] = (byte) (count / 256);
- _PLCCommand[13] = (byte) (count % 256);
- }
-
- _PLCCommand[14] = (byte) 0xff;
- _PLCCommand[15] = 0x02;
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 鐢熸垚涓�涓啓鍏ュ瓧鑺傛暟鎹殑鎸囦护
- *
- * @param address 鍦板潃
- * @param data 鏁版嵁
- * @return 甯︾粨鏋滄爣璇嗙殑鎸囦护
- */
- public static OperateResultExOne<byte[]> BuildWriteCommand(String address, byte[] data) {
- if (data == null) data = new byte[0];
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(analysis);
-
-
- byte[] _PLCCommand = new byte[16 + data.length];
- _PLCCommand[0] = 0x53;
- _PLCCommand[1] = 0x35;
- _PLCCommand[2] = 0x10;
- _PLCCommand[3] = 0x01;
- _PLCCommand[4] = 0x03;
- _PLCCommand[5] = 0x03;
- _PLCCommand[6] = 0x03;
- _PLCCommand[7] = 0x08;
-
- // 鎸囧畾鏁版嵁鍖�
- _PLCCommand[8] = analysis.Content1;
- _PLCCommand[9] = analysis.Content3.byteValue();
-
- // 鎸囧畾鏁版嵁鍦板潃
- _PLCCommand[10] = (byte) (analysis.Content2 / 256);
- _PLCCommand[11] = (byte) (analysis.Content2 % 256);
-
- if (analysis.Content1 == 0x01 || analysis.Content1 == 0x06 || analysis.Content1 == 0x07) {
- if (data.length % 2 != 0) {
- return new OperateResultExOne<byte[]>(StringResources.Language.SiemensReadLengthMustBeEvenNumber());
- } else {
- // 鎸囧畾鏁版嵁闀垮害
- _PLCCommand[12] = (byte) (data.length / 2 / 256);
- _PLCCommand[13] = (byte) (data.length / 2 % 256);
- }
- } else {
- // 鎸囧畾鏁版嵁闀垮害
- _PLCCommand[12] = (byte) (data.length / 256);
- _PLCCommand[13] = (byte) (data.length % 256);
- }
-
- _PLCCommand[14] = (byte) 0xff;
- _PLCCommand[15] = 0x02;
-
- // 鏀剧疆鏁版嵁
- System.arraycopy(data, 0, _PLCCommand, 16, data.length);
-
- return OperateResultExOne.<byte[]>CreateSuccessResult(_PLCCommand);
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensPLCS.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensPLCS.java
deleted file mode 100644
index 0956dfb..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensPLCS.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Siemens;
-
-/**
- * 瑗块棬瀛愮殑PLC绫诲瀷锛岀洰鍓嶆敮鎸佺殑璁块棶绫诲瀷
- */
-public enum SiemensPLCS {
-
- /**
- * 1200绯诲垪
- */
- S1200,
-
- /**
- * 300绯诲垪
- */
- S300,
-
- /**
- * 1500绯诲垪
- */
- S1500,
-
- /**
- * S200Smart绯诲垪
- */
- S200Smart,
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java
deleted file mode 100644
index 0ec720e..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java
+++ /dev/null
@@ -1,807 +0,0 @@
-package com.zy.common.HslCommunication.Profinet.Siemens;
-
-import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
-import com.zy.common.HslCommunication.Core.IMessage.S7Message;
-import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
-import com.zy.common.HslCommunication.Core.Transfer.ReverseBytesTransform;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExThree;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
-import com.zy.common.HslCommunication.StringResources;
-import com.zy.common.HslCommunication.Utilities;
-
-import java.io.ByteArrayOutputStream;
-import java.net.Socket;
-import java.util.Arrays;
-
-/**
- * 瑗块棬瀛愮殑鏁版嵁浜や簰绫伙紝閲囩敤s7鍗忚瀹炵幇
- */
-public class SiemensS7Net extends NetworkDeviceBase<S7Message, ReverseBytesTransform> {
-
-
- /**
- * 瀹炰緥鍖栦竴涓タ闂ㄥ瓙鐨凷7鍗忚鐨勯�氳瀵硅薄
- * @param siemens 鎸囧畾瑗块棬瀛愮殑鍨嬪彿
- */
- public SiemensS7Net(SiemensPLCS siemens) {
- Initialization(siemens, "");
- }
-
-
-
- /**
- * 瀹炰緥鍖栦竴涓タ闂ㄥ瓙鐨凷7鍗忚鐨勯�氳瀵硅薄骞舵寚瀹欼p鍦板潃
- * @param siemens 鎸囧畾瑗块棬瀛愮殑鍨嬪彿
- * @param ipAddress Ip鍦板潃
- */
- public SiemensS7Net(SiemensPLCS siemens, String ipAddress) {
- Initialization(siemens, ipAddress);
- }
-
-
- /**
- * 鍒濆鍖栨柟娉�
- * @param siemens 瑗块棬瀛愮被鍨�
- * @param ipAddress Ip鍦板潃
- */
- private void Initialization(SiemensPLCS siemens, String ipAddress) {
- WordLength = 2;
- setIpAddress(ipAddress);
- setPort(102);
- CurrentPlc = siemens;
-
- switch (siemens) {
- case S1200:
- plcHead1[21] = 0;
- break;
- case S300:
- plcHead1[21] = 2;
- break;
- case S1500:
- plcHead1[21] = 0;
- break;
- case S200Smart: {
- plcHead1 = plcHead1_200smart;
- plcHead2 = plcHead2_200smart;
- break;
- }
- default:
- plcHead1[18] = 0;
- break;
- }
- }
-
-
- /**
- * 鍦ㄥ鎴风杩炴帴涓婃湇鍔″櫒鍚庯紝鎵�鍋氱殑涓�浜涘垵濮嬪寲鎿嶄綔 ->
- * Two handshake actions required after connecting to the server
- * @param socket 缃戠粶濂楁帴瀛�
- * @return 杩斿洖杩炴帴缁撴灉
- */
- @Override
- protected OperateResult InitializationOnConnect(Socket socket) {
- // 绗竴灞傞�氫俊鐨勫垵濮嬪寲
- OperateResultExTwo<byte[], byte[]> read_first = ReadFromCoreServerBase(socket, plcHead1);
- if (!read_first.IsSuccess) return read_first;
-
- // 绗簩灞傞�氫俊鐨勫垵濮嬪寲
- OperateResultExTwo<byte[], byte[]> read_second = ReadFromCoreServerBase(socket, plcHead2);
- if (!read_second.IsSuccess) return read_second;
-
- // 杩斿洖鎴愬姛鐨勪俊鍙�
- return OperateResult.CreateSuccessResult();
- }
-
-
-
- /**
- * 浠嶱LC璇诲彇璁㈣揣鍙蜂俊鎭�
- * @return
- */
- public OperateResultExOne<String> ReadOrderNumber() {
- OperateResultExOne<String> result = new OperateResultExOne<String>();
- OperateResultExOne<byte[]> read = ReadFromCoreServer(plcOrderNumber);
- if (read.IsSuccess) {
- if (read.Content.length > 100) {
- result.IsSuccess = true;
- result.Content = Utilities.getString(Arrays.copyOfRange(read.Content, 71, 20), "ASCII");
- }
- }
-
- if (!result.IsSuccess) {
- result.CopyErrorFromOther(read);
- }
-
- return result;
- }
-
-
-
- /**
- * 浠嶱LC璇诲彇鏁版嵁锛屽湴鍧�鏍煎紡涓篒100锛孮100锛孌B20.100锛孧100锛孴100锛孋100浠ュ瓧鑺備负鍗曚綅
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @param length 璇诲彇鐨勬暟閲忥紝浠ュ瓧鑺備负鍗曚綅
- * @return 缁撴灉瀵硅薄
- */
- @Override
- public OperateResultExOne<byte[]> Read(String address, short length) {
- OperateResultExThree<Byte, Integer, Integer> addressResult = AnalysisAddress(address);
- if (!addressResult.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult(addressResult);
-
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
- short alreadyFinished = 0;
- while (alreadyFinished < length) {
- short readLength = (short) Math.min(length - alreadyFinished, 200);
-
- OperateResultExThree<Byte, Integer, Integer>[] list = new OperateResultExThree[1];
- list[0] = addressResult;
-
- OperateResultExOne<byte[]> read = Read(list, new short[]{readLength});
- if (read.IsSuccess) {
- try {
- outputStream.write(read.Content);
- } catch (Exception ex) {
-
- }
- } else {
- return read;
- }
-
- alreadyFinished += readLength;
- addressResult.Content2 += readLength * 8;
- }
-
- byte[] buffer = outputStream.toByteArray();
-
- try {
- outputStream.close();
- } catch (Exception ex) {
-
- }
-
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
-
-
- /**
- * 浠嶱LC璇诲彇鏁版嵁锛屽湴鍧�鏍煎紡涓篒100锛孮100锛孌B20.100锛孧100锛屼互浣嶄负鍗曚綅
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @return 缁撴灉瀵硅薄
- */
- private OperateResultExOne<byte[]> ReadBitFromPLC(String address) {
- OperateResultExOne<byte[]> command = BuildBitReadCommand(address);
- if (!command.IsSuccess) return command;
-
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return read;
-
-
- int receiveCount = 1;
- if (read.Content.length >= 21 && read.Content[20] == 1) {
- // 鍒嗘瀽缁撴灉
- byte[] buffer = new byte[receiveCount];
-
- if (22 < read.Content.length) {
- if (read.Content[21] == (byte) 0xFF && read.Content[22] == 0x03) {
- // 鏈夋暟鎹�
- buffer[0] = read.Content[25];
- }
- }
-
- return OperateResultExOne.CreateSuccessResult(buffer);
- }
- else {
- return new OperateResultExOne<byte[]>(read.ErrorCode,StringResources.Language.SiemensDataLengthCheckFailed());
- }
- }
-
-
- /**
- * 涓�娆℃�т粠PLC鑾峰彇鎵�鏈夌殑鏁版嵁锛屾寜鐓у厛鍚庨『搴忚繑鍥炰竴涓粺涓�鐨凚uffer锛岄渶瑕佹寜鐓ч『搴忓鐞嗭紝涓や釜鏁扮粍闀垮害蹇呴』涓�鑷�
- * @param address 璧峰鍦板潃鏁扮粍
- * @param length 鏁版嵁闀垮害鏁扮粍
- * @return 缁撴灉鏁版嵁瀵硅薄
- */
- public OperateResultExOne<byte[]> Read(String[] address, short[] length) {
-
- OperateResultExThree<Byte, Integer, Integer>[] list = new OperateResultExThree[address.length];
- for (int i = 0; i < address.length; i++) {
- OperateResultExThree<Byte, Integer, Integer> tmp = AnalysisAddress(address[i]);
- if (!tmp.IsSuccess) return OperateResultExOne.CreateFailedResult(tmp);
-
- list[i] = tmp;
- }
-
- return Read(list, length);
- }
-
-
- /**
- * 璇诲彇鐪熷疄鐨勬暟鎹�
- * @param address 璧峰鍦板潃
- * @param length 闀垮害
- * @return 缁撴灉绫诲璞�
- */
- private OperateResultExOne<byte[]> Read(OperateResultExThree<Byte, Integer, Integer>[] address, short[] length) {
-
- OperateResultExOne<byte[]> command = BuildReadCommand(address, length);
- if (!command.IsSuccess) return command;
-
- OperateResultExOne<byte[]> read = ReadFromCoreServer(command.Content);
- if (!read.IsSuccess) return read;
-
- int receiveCount = 0;
- for (int i = 0; i < length.length; i++) {
- receiveCount += length[i];
- }
-
- if (read.Content.length >= 21 && read.Content[20] == length.length) {
- // 鍒嗘瀽缁撴灉
- byte[] buffer = new byte[receiveCount];
- int kk = 0;
- int ll = 0;
- for (int ii = 21; ii < read.Content.length; ii++) {
- if ((ii + 1) < read.Content.length) {
- if (read.Content[ii] == (byte) 0xFF &&
- read.Content[ii + 1] == 0x04) {
- // 鏈夋暟鎹�
- System.arraycopy(read.Content, ii + 4, buffer, ll, length[kk]);
- ii += length[kk] + 3;
- ll += length[kk];
- kk++;
- }
- }
- }
-
- return OperateResultExOne.CreateSuccessResult(buffer);
- } else {
- return new OperateResultExOne<byte[]>(read.ErrorCode,StringResources.Language.SiemensDataLengthCheckFailed());
- }
- }
-
-
-
- /**
- * 璇诲彇鎸囧畾鍦板潃鐨刡ool鏁版嵁
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @return 缁撴灉绫诲璞�
- */
- public OperateResultExOne<Boolean> ReadBool(String address) {
- return GetBoolResultFromBytes(ReadBitFromPLC(address));
- }
-
-
-
- /**
- * 璇诲彇鎸囧畾鍦板潃鐨刡yte鏁版嵁
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @return 缁撴灉绫诲璞�
- */
- public OperateResultExOne<Byte> ReadByte(String address) {
- return GetByteResultFromBytes(Read(address, (short) 1));
- }
-
-
-
- /**
- * 鍩虹鐨勫啓鍏ユ暟鎹殑鎿嶄綔鏀寔
- * @param entireValue 瀹屾暣鐨勫瓧鑺傛暟鎹�
- * @return 鍐欏叆缁撴灉
- */
- private OperateResult WriteBase(byte[] entireValue) {
- OperateResultExOne<byte[]> write = ReadFromCoreServer(entireValue);
- if (!write.IsSuccess) return write;
-
- if (write.Content[write.Content.length - 1] != (byte) 0xFF) {
- return new OperateResult(write.Content[write.Content.length - 1], StringResources.Language.SiemensWriteError() + write.Content[write.Content.length - 1]);
- } else {
- return OperateResult.CreateSuccessResult();
- }
- }
-
-
-
- /**
- * 灏嗘暟鎹啓鍏ュ埌PLC鏁版嵁锛屽湴鍧�鏍煎紡涓篒100锛孮100锛孌B20.100锛孧100锛屼互瀛楄妭涓哄崟浣�
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @param value 鍐欏叆鐨勬暟鎹紝闀垮害鏍规嵁data鐨勯暱搴︽潵鎸囩ず
- * @return 鍐欏叆缁撴灉
- */
- @Override
- public OperateResult Write(String address, byte[] value) {
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult( analysis );
-
- int length = value.length;
- int alreadyFinished = 0;
- while (alreadyFinished < length) {
- short writeLength = (short) Math.min( length - alreadyFinished, 200 );
- byte[] buffer = getByteTransform().TransByte( value, alreadyFinished, writeLength );
-
- OperateResultExOne<byte[]> command = BuildWriteByteCommand( analysis, buffer );
- if (!command.IsSuccess) return command;
-
- OperateResult write = WriteBase( command.Content );
- if (!write.IsSuccess) return write;
-
- alreadyFinished += writeLength;
- analysis.Content2 += writeLength * 8;
- }
- return OperateResult.CreateSuccessResult( );
- }
-
-
-
-
- /**
- * 鍐欏叆PLC鐨勪竴涓綅锛屼緥濡�"M100.6"锛�"I100.7"锛�"Q100.0"锛�"DB20.100.0"锛屽鏋滃彧鍐欎簡"M100"榛樿涓�"M100.0
- * @param address 璧峰鍦板潃锛屾牸寮忎负I100锛孧100锛孮100锛孌B20.100
- * @param value 鍐欏叆鐨勬暟鎹紝True鎴栨槸False
- * @return 鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean value) {
- // 鐢熸垚鎸囦护
- OperateResultExOne<byte[]> command = BuildWriteBitCommand(address, value);
- if (!command.IsSuccess) return command;
-
- return WriteBase(command.Content);
- }
-
-
- /**
- * 鍚慞LC涓啓鍏ool鏁扮粍锛岃繑鍥炲�艰鏄庯紝姣斿浣犲啓鍏100,閭ｄ箞data[0]瀵瑰簲M100.0
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param values 瑕佸啓鍏ョ殑瀹為檯鏁版嵁锛岄暱搴︿负8鐨勫�嶆暟
- * @return 鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, boolean[] values) {
- return Write(address, SoftBasic.BoolArrayToByte(values));
- }
-
-
-
-
- /**
- * 鍚慞LC涓啓鍏yte鏁版嵁锛岃繑鍥炲�艰鏄�
- * @param address 瑕佸啓鍏ョ殑鏁版嵁鍦板潃
- * @param value 瑕佸啓鍏ョ殑瀹為檯鏁版嵁
- * @return 鍐欏叆缁撴灉
- */
- public OperateResult Write(String address, byte value) {
- return Write(address, new byte[]{value});
- }
-
-
- private byte[] plcHead1 = new byte[]
- {
- 0x03,0x00,0x00,0x16,0x11,(byte) 0xE0,0x00,0x00,0x00,0x01,0x00,(byte) 0xC0,0x01,
- 0x0A,(byte) 0xC1,0x02,0x01,0x02,(byte) 0xC2,0x02,0x01,0x00
- };
- private byte[] plcHead2 = new byte[]
- {
- 0x03,0x00,0x00,0x19,0x02,(byte) 0xF0,(byte) 0x80,0x32,0x01,0x00,0x00,0x04,0x00,0x00,0x08,0x00,0x00,
- (byte) 0xF0,0x00,0x00,0x01,0x00,0x01,0x01,(byte) 0xE0
- };
- private byte[] plcOrderNumber = new byte[]
- {
- 0x03,0x00,0x00,0x21,0x02,(byte) 0xF0,(byte) 0x80,0x32,0x07,0x00,0x00,0x00,0x01,0x00,0x08,0x00,0x08,
- 0x00,0x01,0x12,0x04,0x11,0x44,0x01,0x00,(byte) 0xFF,0x09,0x00,0x04,0x00,0x11,0x00,0x00
- };
- private SiemensPLCS CurrentPlc = SiemensPLCS.S1200;
- private byte[] plcHead1_200smart = new byte[]
- {
- 0x03,0x00,0x00,0x16,0x11,(byte) 0xE0,0x00,0x00,0x00,0x01,0x00,(byte) 0xC1,0x02,0x10,0x00,(byte) 0xC2,
- 0x02,0x03,0x00,(byte) 0xC0,0x01,0x0A
- };
- private byte[] plcHead2_200smart = new byte[]
- {
- 0x03,0x00,0x00,0x19,0x02,(byte) 0xF0,(byte) 0x80,0x32,0x01,0x00,0x00,(byte) 0xCC,(byte) 0xC1,
- 0x00,0x08,0x00,0x00,(byte) 0xF0,0x00,0x00,0x01,0x00,0x01,0x03,(byte) 0xC0
- };
-
-
- /**
- * 杩斿洖琛ㄧず褰撳墠瀵硅薄鐨勫瓧绗︿覆
- * @return 瀛楃涓蹭俊鎭�
- */
- @Override
- public String toString() {
- return "SiemensS7Net";
- }
-
-
-
- /**
- * 璁＄畻鐗规畩鐨勫湴鍧�淇℃伅
- * @param address 瀛楃涓蹭俊鎭�
- * @return 瀹為檯鍊�
- */
- public static int CalculateAddressStarted(String address) {
- if (address.indexOf('.') < 0) {
- return Integer.parseInt(address) * 8;
- } else {
- String[] temp = address.split("\\.");
- return Integer.parseInt(temp[0]) * 8 + Integer.parseInt(temp[1]);
- }
- }
-
- /**
- * 瑙ｆ瀽鏁版嵁鍦板潃锛岃В鏋愬嚭鍦板潃绫诲瀷锛岃捣濮嬪湴鍧�锛孌B鍧楃殑鍦板潃
- * @param address 鏁版嵁鍦板潃
- * @return 瑙ｆ瀽鍑哄湴鍧�绫诲瀷锛岃捣濮嬪湴鍧�锛孌B鍧楃殑鍦板潃
- */
- public static OperateResultExThree<Byte, Integer, Integer> AnalysisAddress(String address) {
- OperateResultExThree<Byte, Integer, Integer> result = new OperateResultExThree<Byte, Integer, Integer>();
- try {
- result.Content3 = 0;
- if (address.charAt(0) == 'I') {
- result.Content1 = (byte) 0x81;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.charAt(0) == 'Q') {
- result.Content1 = (byte) 0x82;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.charAt(0) == 'M') {
- result.Content1 = (byte) 0x83;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.charAt(0) == 'D' || address.substring(0, 2).equals("DB")) {
- result.Content1 = (byte) 0x84;
- String[] adds = address.split("\\.");
- if (address.charAt(1) == 'B') {
- result.Content3 = Integer.parseInt(adds[0].substring(2));
- } else {
- result.Content3 = Integer.parseInt(adds[0].substring(1));
- }
- result.Content2 = CalculateAddressStarted(address.substring(address.indexOf('.') + 1));
- } else if (address.charAt(0) == 'T') {
- result.Content1 = 0x1D;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- } else if (address.charAt(0) == 'C') {
- result.Content1 = 0x1C;
- result.Content2 = CalculateAddressStarted(address.substring(1));
- }
- else if (address.charAt(0) == 'V') {
- result.Content1 = (byte) 0x84;
- result.Content3 = 1;
- result.Content2 = CalculateAddressStarted( address.substring( 1 ) );
- } else {
- return new OperateResultExThree<Byte, Integer, Integer>(StringResources.Language.NotSupportedDataType());
- }
- } catch (Exception ex) {
- result.Message = ex.getMessage();
- return result;
- }
- result.IsSuccess = true;
- return result;
- }
-
- /**
- * 鐢熸垚涓�涓鍙栧瓧鏁版嵁鎸囦护澶寸殑閫氱敤鏂规硶 ->
- * A general method for generating a command header to read a Word data
- * @param address 璧峰鍦板潃锛屼緥濡侻100锛孖0锛孮0锛孌B2.100 -> Start address, such as M100,I0,Q0,DB2.100
- * @param length 璇诲彇鏁版嵁闀垮害 -> Read Data length
- * @return 鍖呭惈缁撴灉瀵硅薄鐨勬姤鏂� -> Message containing the result object
- */
- public static OperateResultExOne<byte[]> BuildReadCommand( String address, short length )
- {
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.<byte[]>CreateFailedResult( analysis );
-
- OperateResultExThree<Byte, Integer, Integer>[] addressList = new OperateResultExThree[1];
- addressList[0] = analysis;
- short[] lengthList = new short[1];
- lengthList[0] = length;
-
- return BuildReadCommand( addressList, lengthList );
- }
-
-
- /**
- * 鐢熸垚涓�涓鍙栧瓧鏁版嵁鎸囦护澶寸殑閫氱敤鏂规硶
- * @param address 瑙ｆ瀽鍚庣殑鍦板潃
- * @param length 姣忎釜鍦板潃鐨勮鍙栭暱搴�
- * @return 鎼哄甫鏈夊懡浠ゅ瓧鑺�
- */
- public static OperateResultExOne<byte[]> BuildReadCommand(OperateResultExThree<Byte, Integer, Integer>[] address, short[] length) {
- if (address == null) throw new RuntimeException("address is null");
- if (length == null) throw new RuntimeException("count is null");
- if (address.length != length.length) throw new RuntimeException(StringResources.Language.TwoParametersLengthIsNotSame());
- if (length.length > 19) throw new RuntimeException(StringResources.Language.SiemensReadLengthCannotLargerThan19());
-
- int readCount = length.length;
-
- byte[] _PLCCommand = new byte[19 + readCount * 12];
-
- // ======================================================================================
- // Header
- // 鎶ユ枃澶�
- _PLCCommand[0] = 0x03;
- _PLCCommand[1] = 0x00;
- // 闀垮害
- _PLCCommand[2] = (byte) (_PLCCommand.length / 256);
- _PLCCommand[3] = (byte) (_PLCCommand.length % 256);
- // 鍥哄畾
- _PLCCommand[4] = 0x02;
- _PLCCommand[5] = (byte) 0xF0;
- _PLCCommand[6] = (byte) 0x80;
- // 鍗忚鏍囪瘑
- _PLCCommand[7] = 0x32;
- // 鍛戒护锛氬彂
- _PLCCommand[8] = 0x01;
- // redundancy identification (reserved): 0x0000;
- _PLCCommand[9] = 0x00;
- _PLCCommand[10] = 0x00;
- // protocol data unit reference; it鈥檚 increased by request event;
- _PLCCommand[11] = 0x00;
- _PLCCommand[12] = 0x01;
- // 鍙傛暟鍛戒护鏁版嵁鎬婚暱搴�
- _PLCCommand[13] = (byte) ((_PLCCommand.length - 17) / 256);
- _PLCCommand[14] = (byte) ((_PLCCommand.length - 17) % 256);
-
- // 璇诲彇鍐呴儴鏁版嵁鏃朵负00锛岃鍙朇PU鍨嬪彿涓篋ata鏁版嵁闀垮害
- _PLCCommand[15] = 0x00;
- _PLCCommand[16] = 0x00;
-
-
- // ======================================================================================
- // Parameter
-
- // 璇诲啓鎸囦护锛�04璇伙紝05鍐�
- _PLCCommand[17] = 0x04;
- // 璇诲彇鏁版嵁鍧椾釜鏁�
- _PLCCommand[18] = (byte) readCount;
-
-
- for (int ii = 0; ii < readCount; ii++) {
- //===========================================================================================
- // 鎸囧畾鏈夋晥鍊肩被鍨�
- _PLCCommand[19 + ii * 12] = 0x12;
- // 鎺ヤ笅鏉ユ湰娆″湴鍧�璁块棶闀垮害
- _PLCCommand[20 + ii * 12] = 0x0A;
- // 璇硶鏍囪锛孉NY
- _PLCCommand[21 + ii * 12] = 0x10;
- // 鎸夊瓧涓哄崟浣�
- _PLCCommand[22 + ii * 12] = 0x02;
- // 璁块棶鏁版嵁鐨勪釜鏁�
- _PLCCommand[23 + ii * 12] = (byte) (length[ii] / 256);
- _PLCCommand[24 + ii * 12] = (byte) (length[ii] % 256);
- // DB鍧楃紪鍙凤紝濡傛灉璁块棶鐨勬槸DB鍧楃殑璇�
- _PLCCommand[25 + ii * 12] = (byte) (address[ii].Content3 / 256);
- _PLCCommand[26 + ii * 12] = (byte) (address[ii].Content3 % 256);
- // 璁块棶鏁版嵁绫诲瀷
- _PLCCommand[27 + ii * 12] = address[ii].Content1;
- // 鍋忕Щ浣嶇疆
- _PLCCommand[28 + ii * 12] = (byte) (address[ii].Content2 / 256 / 256 % 256);
- _PLCCommand[29 + ii * 12] = (byte) (address[ii].Content2 / 256 % 256);
- _PLCCommand[30 + ii * 12] = (byte) (address[ii].Content2 % 256);
- }
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 鐢熸垚涓�涓綅璇诲彇鏁版嵁鎸囦护澶寸殑閫氱敤鏂规硶
- * @param address 璧峰鍦板潃
- * @return 鎸囦护
- */
- public static OperateResultExOne<byte[]> BuildBitReadCommand(String address) {
- byte[] _PLCCommand = new byte[31];
- // 鎶ユ枃澶�
- _PLCCommand[0] = 0x03;
- _PLCCommand[1] = 0x00;
- // 闀垮害
- _PLCCommand[2] = (byte) (_PLCCommand.length / 256);
- _PLCCommand[3] = (byte) (_PLCCommand.length % 256);
- // 鍥哄畾
- _PLCCommand[4] = 0x02;
- _PLCCommand[5] = (byte) 0xF0;
- _PLCCommand[6] = (byte) 0x80;
- _PLCCommand[7] = 0x32;
- // 鍛戒护锛氬彂
- _PLCCommand[8] = 0x01;
- // 鏍囪瘑搴忓垪鍙�
- _PLCCommand[9] = 0x00;
- _PLCCommand[10] = 0x00;
- _PLCCommand[11] = 0x00;
- _PLCCommand[12] = 0x01;
- // 鍛戒护鏁版嵁鎬婚暱搴�
- _PLCCommand[13] = (byte) ((_PLCCommand.length - 17) / 256);
- _PLCCommand[14] = (byte) ((_PLCCommand.length - 17) % 256);
-
- _PLCCommand[15] = 0x00;
- _PLCCommand[16] = 0x00;
-
- // 鍛戒护璧峰绗�
- _PLCCommand[17] = 0x04;
- // 璇诲彇鏁版嵁鍧椾釜鏁�
- _PLCCommand[18] = 0x01;
-
-
- // 濉厖鏁版嵁
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
- //===========================================================================================
- // 璇诲彇鍦板潃鐨勫墠缂�
- _PLCCommand[19] = 0x12;
- _PLCCommand[20] = 0x0A;
- _PLCCommand[21] = 0x10;
- // 璇诲彇鐨勬暟鎹椂浣�
- _PLCCommand[22] = 0x01;
- // 璁块棶鏁版嵁鐨勪釜鏁�
- _PLCCommand[23] = 0x00;
- _PLCCommand[24] = 0x01;
- // DB鍧楃紪鍙凤紝濡傛灉璁块棶鐨勬槸DB鍧楃殑璇�
- _PLCCommand[25] = (byte) (analysis.Content3 / 256);
- _PLCCommand[26] = (byte) (analysis.Content3 % 256);
- // 璁块棶鏁版嵁绫诲瀷
- _PLCCommand[27] = analysis.Content1;
- // 鍋忕Щ浣嶇疆
- _PLCCommand[28] = (byte) (analysis.Content2 / 256 / 256 % 256);
- _PLCCommand[29] = (byte) (analysis.Content2 / 256 % 256);
- _PLCCommand[30] = (byte) (analysis.Content2 % 256);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 鐢熸垚涓�涓啓鍏ュ瓧鑺傛暟鎹殑鎸囦护 -> Generate an instruction to write byte data
- * @param address 璧峰鍦板潃锛岀ず渚婱100,I100,Q100,DB1.100 -> Start Address, example M100,I100,Q100,DB1.100
- * @param data 鍘熷鐨勫瓧鑺傛暟鎹� -> Raw byte data
- * @return 鍖呭惈缁撴灉瀵硅薄鐨勬姤鏂� -> Message containing the result object
- */
- public static OperateResultExOne<byte[]> BuildWriteByteCommand( String address, byte[] data )
- {
- if (data == null) data = new byte[0];
-
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress( address );
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult( analysis );
-
- return BuildWriteByteCommand( analysis, data );
- }
-
- /**
- * 鐢熸垚涓�涓啓鍏ュ瓧鑺傛暟鎹殑鎸囦护
- * @param analysis 鍦板潃
- * @param data 鏁版嵁
- * @return 鎸囦护
- */
- public static OperateResultExOne<byte[]> BuildWriteByteCommand(OperateResultExThree<Byte, Integer, Integer> analysis, byte[] data) {
- if (data == null) data = new byte[0];
-
- byte[] _PLCCommand = new byte[35 + data.length];
- _PLCCommand[0] = 0x03;
- _PLCCommand[1] = 0x00;
- // 闀垮害
- _PLCCommand[2] = (byte) ((35 + data.length) / 256);
- _PLCCommand[3] = (byte) ((35 + data.length) % 256);
- // 鍥哄畾
- _PLCCommand[4] = 0x02;
- _PLCCommand[5] = (byte) 0xF0;
- _PLCCommand[6] = (byte) 0x80;
- _PLCCommand[7] = 0x32;
- // 鍛戒护 鍙�
- _PLCCommand[8] = 0x01;
- // 鏍囪瘑搴忓垪鍙�
- _PLCCommand[9] = 0x00;
- _PLCCommand[10] = 0x00;
- _PLCCommand[11] = 0x00;
- _PLCCommand[12] = 0x01;
- // 鍥哄畾
- _PLCCommand[13] = 0x00;
- _PLCCommand[14] = 0x0E;
- // 鍐欏叆闀垮害+4
- _PLCCommand[15] = (byte) ((4 + data.length) / 256);
- _PLCCommand[16] = (byte) ((4 + data.length) % 256);
- // 璇诲啓鎸囦护
- _PLCCommand[17] = 0x05;
- // 鍐欏叆鏁版嵁鍧椾釜鏁�
- _PLCCommand[18] = 0x01;
- // 鍥哄畾锛岃繑鍥炴暟鎹暱搴�
- _PLCCommand[19] = 0x12;
- _PLCCommand[20] = 0x0A;
- _PLCCommand[21] = 0x10;
- // 鍐欏叆鏂瑰紡锛�1鏄寜浣嶏紝2鏄寜瀛�
- _PLCCommand[22] = 0x02;
- // 鍐欏叆鏁版嵁鐨勪釜鏁�
- _PLCCommand[23] = (byte) (data.length / 256);
- _PLCCommand[24] = (byte) (data.length % 256);
- // DB鍧楃紪鍙凤紝濡傛灉璁块棶鐨勬槸DB鍧楃殑璇�
- _PLCCommand[25] = (byte) (analysis.Content3 / 256);
- _PLCCommand[26] = (byte) (analysis.Content3 % 256);
- // 鍐欏叆鏁版嵁鐨勭被鍨�
- _PLCCommand[27] = analysis.Content1;
- // 鍋忕Щ浣嶇疆
- _PLCCommand[28] = (byte) (analysis.Content2 / 256 / 256 % 256);
- ;
- _PLCCommand[29] = (byte) (analysis.Content2 / 256 % 256);
- _PLCCommand[30] = (byte) (analysis.Content2 % 256);
- // 鎸夊瓧鍐欏叆
- _PLCCommand[31] = 0x00;
- _PLCCommand[32] = 0x04;
- // 鎸変綅璁＄畻鐨勯暱搴�
- _PLCCommand[33] = (byte) (data.length * 8 / 256);
- _PLCCommand[34] = (byte) (data.length * 8 % 256);
-
- System.arraycopy(data, 0, _PLCCommand, 35, data.length);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-
- /**
- * 鐢熸垚涓�涓啓鍏ヤ綅鏁版嵁鐨勬寚浠�
- * @param address 璧峰鍦板潃
- * @param data 鏁版嵁
- * @return 鎸囦护
- */
- public static OperateResultExOne<byte[]> BuildWriteBitCommand(String address, boolean data) {
- OperateResultExThree<Byte, Integer, Integer> analysis = AnalysisAddress(address);
- if (!analysis.IsSuccess) return OperateResultExOne.CreateFailedResult(analysis);
-
-
- byte[] buffer = new byte[1];
- buffer[0] = data ? (byte) 0x01 : (byte) 0x00;
-
- byte[] _PLCCommand = new byte[35 + buffer.length];
- _PLCCommand[0] = 0x03;
- _PLCCommand[1] = 0x00;
- // 闀垮害
- _PLCCommand[2] = (byte) ((35 + buffer.length) / 256);
- _PLCCommand[3] = (byte) ((35 + buffer.length) % 256);
- // 鍥哄畾
- _PLCCommand[4] = 0x02;
- _PLCCommand[5] = (byte) 0xF0;
- _PLCCommand[6] = (byte) 0x80;
- _PLCCommand[7] = 0x32;
- // 鍛戒护 鍙�
- _PLCCommand[8] = 0x01;
- // 鏍囪瘑搴忓垪鍙�
- _PLCCommand[9] = 0x00;
- _PLCCommand[10] = 0x00;
- _PLCCommand[11] = 0x00;
- _PLCCommand[12] = 0x01;
- // 鍥哄畾
- _PLCCommand[13] = 0x00;
- _PLCCommand[14] = 0x0E;
- // 鍐欏叆闀垮害+4
- _PLCCommand[15] = (byte) ((4 + buffer.length) / 256);
- _PLCCommand[16] = (byte) ((4 + buffer.length) % 256);
- // 鍛戒护璧峰绗�
- _PLCCommand[17] = 0x05;
- // 鍐欏叆鏁版嵁鍧椾釜鏁�
- _PLCCommand[18] = 0x01;
- _PLCCommand[19] = 0x12;
- _PLCCommand[20] = 0x0A;
- _PLCCommand[21] = 0x10;
- // 鍐欏叆鏂瑰紡锛�1鏄寜浣嶏紝2鏄寜瀛�
- _PLCCommand[22] = 0x01;
- // 鍐欏叆鏁版嵁鐨勪釜鏁�
- _PLCCommand[23] = (byte) (buffer.length / 256);
- _PLCCommand[24] = (byte) (buffer.length % 256);
- // DB鍧楃紪鍙凤紝濡傛灉璁块棶鐨勬槸DB鍧楃殑璇�
- _PLCCommand[25] = (byte) (analysis.Content3 / 256);
- _PLCCommand[26] = (byte) (analysis.Content3 % 256);
- // 鍐欏叆鏁版嵁鐨勭被鍨�
- _PLCCommand[27] = analysis.Content1;
- // 鍋忕Щ浣嶇疆
- _PLCCommand[28] = (byte) (analysis.Content2 / 256 / 256);
- _PLCCommand[29] = (byte) (analysis.Content2 / 256);
- _PLCCommand[30] = (byte) (analysis.Content2 % 256);
- // 鎸変綅鍐欏叆
- _PLCCommand[31] = 0x00;
- _PLCCommand[32] = 0x03;
- // 鎸変綅璁＄畻鐨勯暱搴�
- _PLCCommand[33] = (byte) (buffer.length / 256);
- _PLCCommand[34] = (byte) (buffer.length % 256);
-
- System.arraycopy(buffer, 0, _PLCCommand, 35, buffer.length);
-
- return OperateResultExOne.CreateSuccessResult(_PLCCommand);
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/StringResources.java b/src/main/java/com/zy/common/HslCommunication/StringResources.java
deleted file mode 100644
index b36da89..0000000
--- a/src/main/java/com/zy/common/HslCommunication/StringResources.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.zy.common.HslCommunication;
-
-
-import com.zy.common.HslCommunication.Language.DefaultLanguage;
-import com.zy.common.HslCommunication.Language.English;
-
-import java.util.Locale;
-
-public class StringResources {
-
- static
- {
- Locale locale = Locale.getDefault();
- if (locale.getLanguage().startsWith( "zh" ))
- {
- SetLanguageChinese( );
- }
- else
- {
- SeteLanguageEnglish( );
- }
- }
-
- /**
- * 鑾峰彇鎴栬缃郴缁熺殑璇█閫夐」 ->
- * Gets or sets the language options for the system
- */
- public static DefaultLanguage Language = new DefaultLanguage( );
-
- /**
- * 灏嗚瑷�璁剧疆涓轰腑鏂� ->
- * Set the language to Chinese
- */
- public static void SetLanguageChinese( )
- {
- Language = new DefaultLanguage( );
- }
-
-
- /**
- * 灏嗚瑷�璁剧疆涓鸿嫳鏂� ->
- * Set the language to English
- */
- public static void SeteLanguageEnglish( )
- {
- Language = new English( );
- }
-
-}
diff --git a/src/main/java/com/zy/common/HslCommunication/Utilities.java b/src/main/java/com/zy/common/HslCommunication/Utilities.java
deleted file mode 100644
index a811842..0000000
--- a/src/main/java/com/zy/common/HslCommunication/Utilities.java
+++ /dev/null
@@ -1,379 +0,0 @@
-package com.zy.common.HslCommunication;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
-
-/**
- * 涓�涓伐鍏风被锛屼负浜嗘敮鎸佸拰C#绋嬪簭閫氫俊浜や簰鐨勮浆鎹㈠伐鍏风被
- */
-public class Utilities {
-
- /**
- * 灏唖hort鏁版嵁绫诲瀷杞寲鎴怋yte鏁扮粍
- * @param data short鍊�
- * @return byte[]鏁扮粍
- */
- public static byte[] getBytes(short data) {
- byte[] bytes = new byte[2];
- bytes[0] = (byte) (data & 0xff);
- bytes[1] = (byte) ((data & 0xff00) >> 8);
- return bytes;
- }
-
- /**
- * 灏唅nt鏁版嵁绫诲瀷杞寲鎴怋yte鏁扮粍
- * @param data int鍊�
- * @return byte[]鏁扮粍
- */
- public static byte[] getBytes(int data) {
- byte[] bytes = new byte[4];
- bytes[0] = (byte) (data & 0xff);
- bytes[1] = (byte) ((data >> 8) & 0xff);
- bytes[2] = (byte) ((data >> 16) & 0xff);
- bytes[3] = (byte) ((data >> 24) & 0xff);
- return bytes;
- }
-
- /**
- * 灏唋ong鏁版嵁绫诲瀷杞寲鎴怋yte鏁扮粍
- * @param data long鍊�
- * @return byte[]鏁扮粍
- */
- public static byte[] getBytes(long data) {
- byte[] bytes = new byte[8];
- bytes[0] = (byte) (data & 0xff);
- bytes[1] = (byte) ((data >> 8) & 0xff);
- bytes[2] = (byte) ((data >> 16) & 0xff);
- bytes[3] = (byte) ((data >> 24) & 0xff);
- bytes[4] = (byte) ((data >> 32) & 0xff);
- bytes[5] = (byte) ((data >> 40) & 0xff);
- bytes[6] = (byte) ((data >> 48) & 0xff);
- bytes[7] = (byte) ((data >> 56) & 0xff);
- return bytes;
- }
-
- /**
- * 灏唂loat鏁版嵁绫诲瀷杞寲鎴怋yte鏁扮粍
- * @param data float鍊�
- * @return byte[]鏁扮粍
- */
- public static byte[] getBytes(float data) {
- int intBits = Float.floatToIntBits(data);
- return getBytes(intBits);
- }
-
- /**
- * 灏哾ouble鏁版嵁绫诲瀷杞寲鎴怋yte鏁扮粍
- * @param data double鍊�
- * @return byte[]鏁扮粍
- */
- public static byte[] getBytes(double data) {
- long intBits = Double.doubleToLongBits(data);
- return getBytes(intBits);
- }
-
-
- /**
- * 灏嗗瓧绗︿覆杞崲鎴恇yte[]鏁扮粍
- * @param data 瀛楃涓插��
- * @param charsetName 缂栫爜鏂瑰紡
- * @return 瀛楄妭鏁扮粍
- */
- public static byte[] getBytes(String data, String charsetName) {
- Charset charset = Charset.forName(charsetName);
- return data.getBytes(charset);
- }
-
-
- /**
- * 灏唅nt杞崲鎴愪竴涓瓧鑺傜殑鏁版嵁
- * @param num int鏁版嵁
- * @return 涓�涓瓧鑺傜殑鏁版嵁
- */
- public static byte int2OneByte(int num) {
- return (byte) (num & 0x000000ff);
- }
-
-
- /**
- * 灏嗕竴涓湁绗﹀彿鐨刡yte杞崲鎴愪竴涓猧nt鏁版嵁瀵硅薄
- * @param byteNum 鏈夌鍙风殑瀛楄妭瀵硅薄
- * @return int鏁版嵁绫诲瀷
- */
- public static int oneByte2Int(byte byteNum) {
- //閽堝姝ｆ暟鐨刬nt
- return byteNum > 0 ? byteNum : 256+ byteNum;
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚short鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @return short鍊�
- */
- public static short getShort(byte[] bytes,int index) {
- return (short) ((0xff & bytes[0 + index]) | (0xff00 & (bytes[1 + index] << 8)));
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚int鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @return int鍊�
- */
- public static int getInt(byte[] bytes,int index) {
- return (0xff & bytes[0 + index]) |
- (0xff00 & (bytes[1 + index] << 8)) |
- (0xff0000 & (bytes[2 + index] << 16)) |
- (0xff000000 & (bytes[3 + index] << 24));
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚long鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @return long鍊�
- */
- public static long getLong(byte[] bytes,int index) {
- return (0xffL & (long) bytes[0 + index]) |
- (0xff00L & ((long) bytes[1 + index] << 8)) |
- (0xff0000L & ((long) bytes[2 + index] << 16)) |
- (0xff000000L & ((long) bytes[3 + index] << 24)) |
- (0xff00000000L & ((long) bytes[4 + index] << 32)) |
- (0xff0000000000L & ((long) bytes[5 + index] << 40)) |
- (0xff000000000000L & ((long) bytes[6 + index] << 48)) |
- (0xff00000000000000L & ((long) bytes[7 + index] << 56));
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚float鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @return float鍊�
- */
- public static float getFloat(byte[] bytes,int index) {
- return Float.intBitsToFloat(getInt(bytes,index));
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚double鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @return double鍊�
- */
- public static double getDouble(byte[] bytes,int index) {
- long l = getLong(bytes, index);
- System.out.println(l);
- return Double.longBitsToDouble(l);
- }
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚string鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param charsetName 瀛楃缂栫爜
- * @return string鍊�
- */
- public static String getString(byte[] bytes, String charsetName) {
- return new String(bytes, Charset.forName(charsetName));
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚string鏁版嵁
- * @param bytes 瀛楄妭鏁扮粍
- * @param index 璧峰浣嶇疆
- * @param length 鏁版嵁闀垮害
- * @param charsetName 瀛楃缂栫爜
- * @return string鍊�
- */
- public static String getString(byte[] bytes,int index, int length, String charsetName) {
- return new String(bytes,index,length,Charset.forName(charsetName));
- }
-
-
- /**
- * 灏嗕竴涓猙yte[]鏁扮粍杞崲鎴恥uid瀵硅薄
- * @param data 瀛楄妭鏁扮粍
- * @return uuid瀵硅薄
- */
- public static UUID Byte2UUID(byte[] data) {
- if (data.length != 16) {
- throw new IllegalArgumentException("Invalid UUID byte[]");
- }
- long msb = 0;
- long lsb = 0;
- for (int i = 0; i < 8; i++)
- msb = (msb << 8) | (data[i] & 0xff);
- for (int i = 8; i < 16; i++)
- lsb = (lsb << 8) | (data[i] & 0xff);
-
- return new UUID(msb, lsb);
- }
-
-
- /**
- * 灏嗕竴涓猽uid瀵硅薄杞寲鎴恇yte[]
- * @param uuid uuid瀵硅薄
- * @return 瀛楄妭鏁扮粍
- */
- public static byte[] UUID2Byte(UUID uuid) {
- ByteArrayOutputStream ba = new ByteArrayOutputStream(16);
- DataOutputStream da = new DataOutputStream(ba);
- try {
- da.writeLong(uuid.getMostSignificantBits());
- da.writeLong(uuid.getLeastSignificantBits());
- ba.close();
- da.close();
- }
- catch (IOException e) {
- e.printStackTrace();
- }
-
- byte[] buffer = ba.toByteArray();
- // 杩涜閿欎綅
- byte temp=buffer[0];
- buffer[0] = buffer[3];
- buffer[3] =temp;
- temp=buffer[1];
- buffer[1]=buffer[2];
- buffer[2]=temp;
-
- temp = buffer[4];
- buffer[4]=buffer[5];
- buffer[5] =temp;
-
- temp = buffer[6];
- buffer[6]=buffer[7];
- buffer[7] =temp;
-
- return buffer;
- }
-
-
-
- /**
- * 灏嗗瓧绗︿覆鏁版嵁杞崲鎴愬瓧鑺傛暟缁勶紝涓昏杞崲鐢盋#鐨勫瓧绗︿覆鐨勬暟鎹�
- * @param str 瀛楃涓蹭俊鎭�
- * @return 杞寲鍚庣殑瀛楄妭鏁扮粍
- */
- public static byte[] string2Byte(String str) {
- if (str == null) {
- return null;
- }
- byte[] byteArray;
- try {
- byteArray = str.getBytes("unicode");
- } catch (Exception ex) {
- byteArray = str.getBytes();
- }
-
- if (byteArray.length >= 2) {
- if (byteArray[0] == -1 && byteArray[1] == -2) {
- byte[] newArray = new byte[byteArray.length - 2];
- System.arraycopy(byteArray, 2, newArray, 0, newArray.length);
- byteArray = newArray;
- } else if (byteArray[0] == -2 && byteArray[1] == -1) {
- for (int i = 0; i < byteArray.length; i++) {
- byte temp = byteArray[i];
- byteArray[i] = byteArray[i + 1];
- byteArray[i + 1] = temp;
- i++;
- }
-
-
- byte[] newArray = new byte[byteArray.length - 2];
- System.arraycopy(byteArray, 2, newArray, 0, newArray.length);
- byteArray = newArray;
- }
- }
-
- return byteArray;
- }
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚瀛楃涓插璞★紝涓昏杞崲鐢盋#鐨勫瓧绗︿覆鐨勬暟鎹�
- * @param byteArray
- * @return
- */
- public static String byte2String(byte[] byteArray) {
- if (byteArray == null) {
- return null;
- }
-
- for (int i = 0; i < byteArray.length; i++) {
- byte temp = byteArray[i];
- byteArray[i] = byteArray[i + 1];
- byteArray[i + 1] = temp;
- i++;
- }
- String str;
- try {
- str = new String(byteArray, "unicode");
- } catch (Exception ex) {
- str = new String(byteArray);
- }
- return str;
- }
-
- /**
- * 灏哹yte[]鏁扮粍鐨勬暟鎹繘琛岀炕杞�
- * @param reverse 绛夊緟鍙嶈浆鐨勫瓧绗︿覆
- */
- public static void bytesReverse(byte[] reverse) {
- if (reverse != null) {
- byte tmp = 0;
- for (int i = 0; i < reverse.length / 2; i++) {
- tmp = reverse[i];
- reverse[i] = reverse[reverse.length - 1 - i];
- reverse[reverse.length - 1 - i] = tmp;
- }
- }
- }
-
-
-
- private static final char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5',
- '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-
- /**
- * 灏嗗瓧鑺傛暟缁勮浆鎹㈡垚鍗佸叚杩涘埗鐨勫瓧绗︿覆褰㈠紡
- * @param bytes 鍘熷鐨勫瓧鑺傛暟缁�
- * @return 瀛楃涓蹭俊鎭�
- */
- public static String bytes2HexString(byte[] bytes) {
- char[] buf = new char[bytes.length * 2];
- int index = 0;
- for(byte b : bytes) { // 鍒╃敤浣嶈繍绠楄繘琛岃浆鎹紝鍙互鐪嬩綔鏂规硶涓�鐨勫彉绉�
- buf[index++] = HEX_CHAR[b >>> 4 & 0xf];
- buf[index++] = HEX_CHAR[b & 0xf];
- }
-
- return new String(buf);
- }
-
- /**
- * 鑾峰彇鎸囧畾鏃堕棿鐨勬寚瀹氭牸寮忕殑瀛楃涓�
- * @param date 鎸囧畾鐨勬椂闂�
- * @param format 鎸囧畾鐨勬牸寮�
- * @return 鏈�鍚庡瓧绗︿覆淇℃伅
- */
- public static String getStringDateShort(Date date,String format) {
- SimpleDateFormat formatter = new SimpleDateFormat(format);
- String dateString = formatter.format(date);
- return dateString;
- }
-}
diff --git a/src/main/java/com/zy/common/Main.java b/src/main/java/com/zy/common/Main.java
index d79d1b0..20f4ffe 100644
--- a/src/main/java/com/zy/common/Main.java
+++ b/src/main/java/com/zy/common/Main.java
@@ -1,20 +1,20 @@
package com.zy.common;
-import com.zy.common.HslCommunication.Core.Net.NetHandle;
-import com.zy.common.HslCommunication.Core.Transfer.DataFormat;
-import com.zy.common.HslCommunication.Core.Types.ActionOperateExThree;
-import com.zy.common.HslCommunication.Core.Types.ActionOperateExTwo;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Enthernet.ComplexNet.NetComplexClient;
-import com.zy.common.HslCommunication.Enthernet.PushNet.NetPushClient;
-import com.zy.common.HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
-import com.zy.common.HslCommunication.ModBus.ModbusTcpNet;
-import com.zy.common.HslCommunication.Profinet.Melsec.MelsecA1ENet;
-import com.zy.common.HslCommunication.Profinet.Melsec.MelsecMcAsciiNet;
-import com.zy.common.HslCommunication.Profinet.Melsec.MelsecMcNet;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
+import HslCommunication.Core.Net.NetHandle;
+import HslCommunication.Core.Transfer.DataFormat;
+import HslCommunication.Core.Types.ActionOperateExThree;
+import HslCommunication.Core.Types.ActionOperateExTwo;
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Enthernet.ComplexNet.NetComplexClient;
+import HslCommunication.Enthernet.PushNet.NetPushClient;
+import HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
+import HslCommunication.ModBus.ModbusTcpNet;
+import HslCommunication.Profinet.Melsec.MelsecA1ENet;
+import HslCommunication.Profinet.Melsec.MelsecMcAsciiNet;
+import HslCommunication.Profinet.Melsec.MelsecMcNet;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import java.util.Arrays;
diff --git a/src/main/java/com/zy/core/channel/TestController.java b/src/main/java/com/zy/core/channel/TestController.java
index f586b42..319453d 100644
--- a/src/main/java/com/zy/core/channel/TestController.java
+++ b/src/main/java/com/zy/core/channel/TestController.java
@@ -15,7 +15,6 @@
@RequestMapping("/test")
public String test(){
Task task = new Task();
- task.setId(1);
MessageQueue.offer(SlaveType.Crn, 1, task);
return "ok";
}
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 9e281ad..81fe5c7 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,8 +1,8 @@
package com.zy.core.thread;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -62,6 +62,8 @@
public boolean connect() {
boolean result = false;
siemensNet = new SiemensS7Net(SiemensPLCS.S1200,slave.getIp());
+ siemensNet.setRack((byte) 0);
+ siemensNet.setSlot((byte) 1);
OperateResult connect = siemensNet.ConnectServer();
if(connect.IsSuccess){
result = true;
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 1e57bfc..03f028f 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,9 +1,9 @@
package com.zy.core.thread;
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -72,6 +72,8 @@
public boolean connect() {
boolean result = false;
siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+ siemensS7Net.setRack((byte) 0);
+ siemensS7Net.setSlot((byte) 1);
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
--
Gitblit v1.9.1