From 7bb6bff9506d1b0153b814e45f622c4f8538f67c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 05 八月 2020 16:43:45 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/Main.java | 2 +- src/main/java/com/zy/core/cache/MessageQueue.java | 5 ++--- src/main/java/com/zy/core/thread/DevpThread.java | 17 ++++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/common/Main.java b/src/main/java/com/zy/common/Main.java index 8b72711..d79d1b0 100644 --- a/src/main/java/com/zy/common/Main.java +++ b/src/main/java/com/zy/common/Main.java @@ -283,7 +283,7 @@ /** - * 鍥涢棬瀛� + * 瑗块棬瀛� */ private static void SiemesTest(){ SiemensS7Net siemens_net = new SiemensS7Net(SiemensPLCS.S1200,"192.168.1.195"); diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java index 20d588c..deb09e8 100644 --- a/src/main/java/com/zy/core/cache/MessageQueue.java +++ b/src/main/java/com/zy/core/cache/MessageQueue.java @@ -1,7 +1,6 @@ package com.zy.core.cache; import com.zy.core.Slave; -import com.zy.core.ThreadHandler; import com.zy.core.enums.SlaveType; import com.zy.core.model.Task; @@ -27,8 +26,8 @@ private static final Map<Integer, ConcurrentLinkedQueue<Task>> SCALE_EXCHANGE = new ConcurrentHashMap<>(); /** - * mq 浜ゆ崲鏈哄垵濮嬪寲 - **/ + * mq 浜ゆ崲鏈哄垵濮嬪寲 + */ public static void init(SlaveType type, Slave slave) { switch (type) { case Crn: diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java index d61638d..8debfbc 100644 --- a/src/main/java/com/zy/core/thread/DevpThread.java +++ b/src/main/java/com/zy/core/thread/DevpThread.java @@ -1,7 +1,8 @@ package com.zy.core.thread; import com.zy.common.HslCommunication.Core.Types.OperateResult; -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 com.zy.core.Slave; import com.zy.core.ThreadHandler; import com.zy.core.cache.MessageQueue; @@ -19,7 +20,7 @@ public class DevpThread implements Runnable, ThreadHandler { private Slave slave; - private MelsecMcNet melsecMcNet; + private SiemensS7Net siemensS7Net; public DevpThread(Slave slave) { this.slave = slave; @@ -45,15 +46,17 @@ @Override public boolean connect() { - melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort()); - OperateResult operateResult = melsecMcNet.ConnectServer(); - if (operateResult.IsSuccess) { + boolean result = false; + siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp()); + OperateResult connect = siemensS7Net.ConnectServer(); + if(connect.IsSuccess){ + result = true; log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); - return true; } else { log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); - return false; } + siemensS7Net.ConnectClose(); + return result; } @Override -- Gitblit v1.9.1