From bc517b90731dfc34b8aee0d7f4877d96b09c18da Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:06:03 +0800
Subject: [PATCH] Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
similarity index 98%
rename from src/main/java/com/zy/core/thread/CrnThread.java
rename to src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e548e0f..afabb67 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -9,7 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnpService;
-import com.zy.core.ThreadHandler;
+import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnStatusType;
@@ -31,14 +31,14 @@
*/
@Data
@Slf4j
-public class CrnThread implements Runnable, ThreadHandler {
+public class SiemensCrnThread implements Runnable, CrnThread {
private SiemensS7Net siemensNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
- public CrnThread(CrnSlave slave) {
+ public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -218,7 +218,7 @@
slave.setIp("192.168.6.9");
slave.setRack(0);
slave.setSlot(0);
- CrnThread crnThread = new CrnThread(slave);
+ SiemensCrnThread crnThread = new SiemensCrnThread(slave);
crnThread.connect();
crnThread.readStatus();
System.out.println(JSON.toJSONString(crnThread.crnProtocol));
--
Gitblit v1.9.1