From 09c4b134bf8b8221635a06bd7ee3064c759b7dcf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 三月 2023 12:57:06 +0800
Subject: [PATCH] 提升机代码部分
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 1e3d471..cbc2bf8 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -4,32 +4,24 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.ModBus.ModbusTcpNet;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
-import com.core.common.RadixTools;
import com.core.exception.CoolException;
import com.zy.common.utils.CommonUtils;
import com.zy.core.News;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.ShuttleStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.ShuttleCommand;
-import com.zy.core.model.command.SteCommand;
import com.zy.core.model.protocol.ShuttleProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
import java.util.Date;
-import java.util.Random;
/**
* 鍥涘悜绌挎杞︾嚎绋�
@@ -41,7 +33,6 @@
private ModbusTcpNet modbusTcpNet;
private ShuttleSlave slave;
private ShuttleProtocol shuttleProtocol;
- private SiemensS7Net siemensS7Net;
public ShuttleThread(ShuttleSlave slave) {
this.slave = slave;
@@ -99,7 +90,7 @@
@Override
public void close() {
-
+ modbusTcpNet.ConnectClose();
}
private void readStatus() {
@@ -175,7 +166,6 @@
command.setShuttleNo(slave.getId());
// 寮�濮嬩换鍔�
- //...
short[] array = new short[17];
//鎺у埗鎸囦护瀛�
array[0] = command.getCommandWord();
--
Gitblit v1.9.1