From 7f34a90f8e27465d8209b906fed2754a3f9ac214 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 05 八月 2020 14:50:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index c3c8223..d61638d 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -19,9 +19,11 @@
 public class DevpThread implements Runnable, ThreadHandler {
 
     private Slave slave;
+    private MelsecMcNet melsecMcNet;
 
     public DevpThread(Slave slave) {
         this.slave = slave;
+        connect();
     }
 
     @Override
@@ -30,7 +32,7 @@
         while (true) {
             try {
                 Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
-                if (task == null) {
+                if (task != null) {
                     System.out.println("浠诲姟"+task.getId());
                 }
                 Thread.sleep(3000);
@@ -43,13 +45,13 @@
 
     @Override
     public boolean connect() {
-        MelsecMcNet melsec_net = new MelsecMcNet(slave.getIp(), slave.getPort());
-        OperateResult operateResult = melsec_net.ConnectServer();
+        melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
+        OperateResult operateResult = melsecMcNet.ConnectServer();
         if (operateResult.IsSuccess) {
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
+            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             return true;
         } else {
-            log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
+            log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             return false;
         }
     }

--
Gitblit v1.9.1