From be322af3013501b822e4dab60ca348cc3db8bcbc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:51:52 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/java/com/zy/core/ServerBootstrap.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 2888984..5b15d24 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,15 +1,15 @@
package com.zy.core;
-import com.zy.utils.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
-import com.zy.core.model.RgvSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.LedThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -58,9 +58,9 @@
MessageQueue.init(SlaveType.Crn, crn);
}
// 鍒濆鍖朢gv灏忚溅mq
- for (Slave rgv : slaveProperties.getRgv()) {
- MessageQueue.init(SlaveType.Rgv, rgv);
- }
+// for (Slave rgv : slaveProperties.getRgv()) {
+// MessageQueue.init(SlaveType.Rgv, rgv);
+// }
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -85,19 +85,19 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
+// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// CrnThread crnThread = new SiemensCrnThread(crn);
+// new Thread((Runnable) crnThread).start();
+// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+// }
// 鍒濆鍖栫┛姊溅绾跨▼
- log.info("鍒濆鍖朢GV绾跨▼...................................................");
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- RgvThread rgvThread = new RgvThread(rgv);
- new Thread((Runnable) rgvThread).start();
- SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
- }
+// log.info("鍒濆鍖朢GV绾跨▼...................................................");
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+// RgvThread rgvThread = new RgvThread(rgv);
+// new Thread((Runnable) rgvThread).start();
+// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
+// }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
--
Gitblit v1.9.1