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 | 39 ++++++++++++++++++++++++++++++++++++---
pom.xml | 5 +++++
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index da038fe..60478db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,11 @@
<version>1.16.22</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.dathlin</groupId>
+ <artifactId>HslCommunication</artifactId>
+ <version>2.0.0</version>
+ </dependency>
<!-- okHttp3 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 8b0da7e..9e281ad 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,5 +1,8 @@
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;
@@ -16,6 +19,7 @@
@Slf4j
public class CrnThread implements Runnable, ThreadHandler {
+ SiemensS7Net siemensNet;
private Slave slave;
public CrnThread(Slave slave) {
@@ -27,9 +31,24 @@
public void run() {
while (true) {
try {
- Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
if (task != null) {
- System.out.println("浠诲姟"+task.getId());
+ 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) {
@@ -41,7 +60,21 @@
@Override
public boolean connect() {
- return false;
+ 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
--
Gitblit v1.9.1