From 3866f14deeae4e7a7c0cb4d3b98c4ce7d5c48e4f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 07 八月 2020 15:46:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 233adbd..9e281ad 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,21 +1,26 @@
 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 com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
 import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.SlaveType;
 import com.zy.core.model.Task;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 /**
+ * 鍫嗗灈鏈虹嚎绋�
  * Created by vincent on 2020/8/4
  */
-@Slf4j
 @Data
+@Slf4j
 public class CrnThread implements Runnable, ThreadHandler {
 
+    SiemensS7Net siemensNet;
     private Slave slave;
-    private int distance;
 
     public CrnThread(Slave slave) {
         this.slave = slave;
@@ -26,17 +31,25 @@
     public void run() {
         while (true) {
             try {
-                System.out.println("绾跨▼"+slave.getId()+"姝e湪杩愯");
-                Task task = MessageQueue.CRN_QUE.poll();
-                if (task == null) {
-                    System.out.println("鏃犱换鍔�");
-                } else {
-
-                    System.out.println("浠诲姟"+task.getId());
-
-
+                int step = 1;
+                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+                if (task != null) {
+                    step = task.getStep();
                 }
-
+                switch (step) {
+                    // 璇绘暟鎹�
+                    case 1:
+                        readStatus();   // 璇诲彇鐘舵��
+                        break;
+                    case 2:
+                        break;
+                    case 3:
+                        break;
+                    case 4:
+                        break;
+                    default:
+                        break;
+                }
                 Thread.sleep(3000);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -46,6 +59,25 @@
     }
 
     @Override
+    public boolean connect() {
+        boolean result = false;
+        siemensNet = new SiemensS7Net(SiemensPLCS.S1200,slave.getIp());
+        OperateResult connect = siemensNet.ConnectServer();
+        if(connect.IsSuccess){
+            result = true;
+            log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        } else {
+            log.info("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        }
+        siemensNet.ConnectClose();
+        return result;
+    }
+
+    private void readStatus(){
+
+    }
+
+    @Override
     public void close() {
     }
 }

--
Gitblit v1.9.1