From 4ceb4a8697b05d3176c30e00191296969a98016d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 09:53:42 +0800
Subject: [PATCH] Merge branch 'jsasrs' of https://gitee.com/luxiaotao1123/zy-wcs
---
src/main/java/com/zy/core/thread/DevpThread.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index f7e1035..7f092a0 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -5,15 +5,19 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.OutputQueue;
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.text.MessageFormat;
+import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,12 +35,12 @@
public DevpThread(Slave slave) {
this.slave = slave;
- connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ connect();
while (true) {
try {
int step = 1;
@@ -56,7 +60,10 @@
default:
break;
}
- Thread.sleep(500);
+
+ // 蹇冭烦
+ heartbeat();
+ Thread.sleep(400);
} catch (Exception e) {
e.printStackTrace();
}
@@ -73,8 +80,10 @@
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
siemensS7Net.ConnectClose();
@@ -82,7 +91,7 @@
}
/**
- * 璇诲彇鐘舵��
+ * 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read(){
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
@@ -111,7 +120,7 @@
}
/**
- * 鍐欏叆
+ * 鍐欏叆 =====> 鍗曠珯鐐瑰啓鍏�
*/
private void write(StaProtocol staProtocol){
if (null == staProtocol) {
@@ -131,6 +140,16 @@
}
}
+ /**
+ * 蹇冭烦
+ */
+ private void heartbeat(){
+ OperateResult write = siemensS7Net.Write("DB100.50", (short) 1);
+ if (!write.IsSuccess) {
+ log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+ }
+ }
+
@Override
public void close() {
siemensS7Net.ConnectClose();
@@ -140,11 +159,12 @@
Slave slave = new Slave();
slave.setIp("192.168.2.125");
DevpThread devpThread = new DevpThread(slave);
+ devpThread.connect();
devpThread.read();
// 鍐�
StaProtocol staProtocol = devpThread.getStation().get(1);
- staProtocol.setWorkNo((short) 888);
- staProtocol.setStaNo((short) 1001);
+ staProtocol.setWorkNo((short) 232);
+ staProtocol.setStaNo((short) 6);
staProtocol.setAutoing(true);
staProtocol.setEmptyMk(true);
staProtocol.setInEnable(true);
--
Gitblit v1.9.1