CaiXiang/dc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新 S7 部分

Browse Source
This commit is contained in:
caixiang 2022-02-10 09:35:10 +08:00
parent 0d326d95a7
commit 83ac4db80f
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/qgs/dc/s7/my/s7connector/enmuc/S7Client.java
View File

@ -22,7 +22,6 @@ public enum S7Client {
;
private String host;
//默认 0 机架号
@ -104,7 +103,7 @@ public enum S7Client {
if(connect!=null){
connections.add(connect);
}else {
logger.info("check_ping 断线重连出现异常。。");
logger.info("（check_ping） 断线重连出现异常。。");
}
}
@ -112,7 +111,7 @@ public enum S7Client {
try {
Thread.sleep(10000);
}catch (Exception e){
logger.info(e.getMessage());
logger.info("（check_ping）"+e.getMessage());
}
}
}
@ -138,8 +137,7 @@ public enum S7Client {
System.out.println(connector.hashCode()+" : ping");
Thread.sleep(100);
}catch (Exception e){
System.out.println(connector.hashCode()+" : connection error");
logger.info(e.getMessage());
logger.info(connector.hashCode()+" : connection error"+"errMessage is : "+e.getMessage());
//先把 socket close掉
try {
connector.close();
@ -147,7 +145,7 @@ public enum S7Client {
//如果是网络波动照成的socket断开。 等个1S 再重连试试
Thread.sleep(100);
}catch (Exception ee){
logger.info(ee.getMessage());
logger.info("connector.close() 出现异常，errMessage is : "+ee.getMessage());
}
@ -160,7 +158,7 @@ public enum S7Client {
if(connect!=null){
connections.add(connect);
}else {
logger.info("断线重连出现异常。。");
logger.info("ping时候出现异常，尝试重连， 重连时候还是 出现异常。。");
}
}

2
src/main/java/com/qgs/dc/s7/my/s7connector/impl/nodave/PLCinterface.java
View File

@ -56,7 +56,7 @@ public final class PLCinterface {
e.printStackTrace();
}
}
res = 0;
res = -1;
while ((this.in.available() > 0) && (len > 0)) {
res = this.in.read(b, start, len);
start += res;

3
src/main/java/com/qgs/dc/s7/my/s7connector/impl/nodave/TCPConnection.java
View File

@ -123,6 +123,7 @@ public final class TCPConnection extends S7Connection {
*
* @return the int
* 0 ==> 不成功
* -1 ==> 读到一个空的字节流 （这种情况很少）
* 其他 ==> 成功
*/
protected int readISOPacket() {
@ -165,7 +166,7 @@ public final class TCPConnection extends S7Connection {
* the size
* @return the int
* 1 ==> 成功
* 0 ==> 不成功
* 0 ==> 不成功（出现异常了）
*/
protected int sendISOPacket(int size) {
size += 4;