From 62abd52e558154724ee2172a4f0af451c8e34f64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 14:54:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/DevpThread.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index c41c511..030e98b 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,14 +1,19 @@
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;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 杈撻�佺嚎绾跨▼
@@ -19,7 +24,8 @@
public class DevpThread implements Runnable, ThreadHandler {
private Slave slave;
- private MelsecMcNet melsecMcNet;
+ private SiemensS7Net siemensS7Net;
+ private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
public DevpThread(Slave slave) {
this.slave = slave;
@@ -32,7 +38,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);
@@ -45,15 +51,17 @@
@Override
public boolean connect() {
- melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
- OperateResult operateResult = melsecMcNet.ConnectServer();
- if (operateResult.IsSuccess) {
- log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
- return true;
+ 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());
} else {
- log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [ip:{}] [port:{}]", slave.getIp(), slave.getPort());
- return false;
+ log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
+ siemensS7Net.ConnectClose();
+ return result;
}
@Override
--
Gitblit v1.9.1