From d0a5fb426796e85f7fcacc5e52b84c60509ec12b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 11:18:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4b2442a..9a2df23 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,12 +1,13 @@
package com.zy.core.thread;
import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import 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.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
@@ -21,11 +22,11 @@
@Slf4j
public class CrnThread implements Runnable, ThreadHandler {
- SiemensS7Net siemensNet;
- private Slave slave;
+ private SiemensS7Net siemensNet;
+ private CrnSlave slave;
private CrnProtocol crnProtocol;
- public CrnThread(Slave slave) {
+ public CrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -66,15 +67,15 @@
@Override
public boolean connect() {
boolean result = false;
- siemensNet = new SiemensS7Net(SiemensPLCS.S1200,slave.getIp());
- siemensNet.setRack((byte) 0);
- siemensNet.setSlot((byte) 1);
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+ siemensNet.setRack(slave.getRack().byteValue());
+ siemensNet.setSlot(slave.getSlot().byteValue());
OperateResult connect = siemensNet.ConnectServer();
if(connect.IsSuccess){
result = true;
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
} else {
- log.info("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.info("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
siemensNet.ConnectClose();
return result;
@@ -84,23 +85,29 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- CrnProtocol protocol = new CrnProtocol();
- protocol.setMode(siemensNet.ReadInt16("D2231").Content);
- protocol.setEStop(siemensNet.ReadInt16("D2232").Content);
- protocol.setTaskNo(siemensNet.ReadInt16("D2233").Content);
- protocol.setStatus(siemensNet.ReadInt16("D2234").Content);
- protocol.setBay(siemensNet.ReadInt16("D2235").Content);
- protocol.setLevel(siemensNet.ReadInt16("D2236").Content);
- protocol.setForkPos(siemensNet.ReadInt16("D2237").Content);
- protocol.setLiftPos(siemensNet.ReadInt16("D2238").Content);
- protocol.setWalkPos(siemensNet.ReadInt16("D2239").Content);
- protocol.setTaskFinish(siemensNet.ReadInt16("D2240").Content);
- protocol.setLoaded(siemensNet.ReadInt16("D2241").Content);
- protocol.setAlarm(siemensNet.ReadInt16("D2242").Content);
- protocol.setXDistance(siemensNet.ReadInt32("D2251").Content);
- protocol.setYDistance(siemensNet.ReadInt32("D2253").Content);
- protocol.setDuration(siemensNet.ReadInt32("D2255").Content);
- this.crnProtocol = protocol;
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 10);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ }
+ crnProtocol.setMode(siemensNet.ReadInt16("D2231").Content);
+// crnProtocol.setEStop(siemensNet.ReadInt16("D2232").Content);
+ crnProtocol.setTaskNo(siemensNet.ReadInt16("D2233").Content);
+ crnProtocol.setStatus(siemensNet.ReadInt16("D2234").Content);
+ crnProtocol.setBay(siemensNet.ReadInt16("D2235").Content);
+ crnProtocol.setLevel(siemensNet.ReadInt16("D2236").Content);
+ crnProtocol.setForkPos(siemensNet.ReadInt16("D2237").Content);
+ crnProtocol.setLiftPos(siemensNet.ReadInt16("D2238").Content);
+ crnProtocol.setWalkPos(siemensNet.ReadInt16("D2239").Content);
+ crnProtocol.setTaskFinish(siemensNet.ReadInt16("D2240").Content);
+ crnProtocol.setLoaded(siemensNet.ReadInt16("D2241").Content);
+ crnProtocol.setAlarm(siemensNet.ReadInt16("D2242").Content);
+ crnProtocol.setXDistance(siemensNet.ReadInt32("D2251").Content);
+ crnProtocol.setYDistance(siemensNet.ReadInt32("D2253").Content);
+ crnProtocol.setDuration(siemensNet.ReadInt32("D2255").Content);
+ } else {
+ log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
}
/**
@@ -113,7 +120,12 @@
@Override
public void close() {
+ }
-
+ public CrnProtocol getCrnProtocol(){
+ if (crnProtocol == null) {
+ readStatus();
+ }
+ return this.crnProtocol;
}
}
--
Gitblit v1.9.1