From 7e36eb78c63d2ed483bb8f717666f25c54f2e8b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 05 八月 2020 14:41:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ThreadHandler.java | 4 +---
src/main/java/com/zy/core/thread/CrnThread.java | 12 ++++++++----
src/main/java/com/zy/core/thread/DevpThread.java | 36 ++++++++++++++++++++++++++++++++++++
src/main/resources/application.yml | 4 ----
4 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/ThreadHandler.java b/src/main/java/com/zy/core/ThreadHandler.java
index ccdfe7e..9b08feb 100644
--- a/src/main/java/com/zy/core/ThreadHandler.java
+++ b/src/main/java/com/zy/core/ThreadHandler.java
@@ -2,9 +2,7 @@
public interface ThreadHandler {
- String CRN_PREFIX = "CRN_";
-
- String DEVP_PREFIX = "DEVP_";
+ boolean connect();
void close();
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 733dc1f..8b0da7e 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -9,10 +9,11 @@
import lombok.extern.slf4j.Slf4j;
/**
+ * 鍫嗗灈鏈虹嚎绋�
* Created by vincent on 2020/8/4
*/
-@Slf4j
@Data
+@Slf4j
public class CrnThread implements Runnable, ThreadHandler {
private Slave slave;
@@ -27,9 +28,7 @@
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
- if (task == null) {
- System.out.println("鏃犱换鍔�");
- } else {
+ if (task != null) {
System.out.println("浠诲姟"+task.getId());
}
Thread.sleep(3000);
@@ -41,6 +40,11 @@
}
@Override
+ public boolean connect() {
+ return false;
+ }
+
+ @Override
public void close() {
}
}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 8e1ee03..c3c8223 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,11 +1,21 @@
package com.zy.core.thread;
+import com.zy.common.HslCommunication.Core.Types.OperateResult;
+import com.zy.common.HslCommunication.Profinet.Melsec.MelsecMcNet;
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
*/
+@Data
+@Slf4j
public class DevpThread implements Runnable, ThreadHandler {
private Slave slave;
@@ -15,7 +25,33 @@
}
@Override
+ @SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ while (true) {
+ try {
+ Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+ if (task == null) {
+ System.out.println("浠诲姟"+task.getId());
+ }
+ Thread.sleep(3000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+ @Override
+ public boolean connect() {
+ MelsecMcNet melsec_net = new MelsecMcNet(slave.getIp(), slave.getPort());
+ OperateResult operateResult = melsec_net.ConnectServer();
+ if (operateResult.IsSuccess) {
+ log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
+ return true;
+ } else {
+ log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
+ return false;
+ }
}
@Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 82cda93..aca5257 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -40,10 +40,6 @@
id: 1
ip: 192.168.1.1
port: 8888
-# crn[1]:
-# id: 2
-# ip: 192.168.1.1
-# port: 8888
# 绔欑偣
devp[0]:
id: 1
--
Gitblit v1.9.1