From b5dad5bca39b68fdaaaf844e38fcc55e94bb34f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 15:23:50 +0800
Subject: [PATCH] 地图处于其他楼层时无法显示提升机口站点问题
---
src/main/java/com/zy/core/ServerBootstrap.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 151df14..665d92d 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,12 +1,10 @@
package com.zy.core;
+import com.zy.common.utils.RedisUtil;
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.SteSlave;
+import com.zy.core.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +26,8 @@
private SlaveProperties slaveProperties;
@Autowired
private MainProcess mainProcess;
+ @Autowired
+ private RedisUtil redisUtil;
@PostConstruct
@@ -73,6 +73,14 @@
for (Slave ste : slaveProperties.getSte()) {
MessageQueue.init(SlaveType.Ste, ste);
}
+ // 鍒濆鍖栨彁鍗囨満mq
+ for (Slave lift : slaveProperties.getLift()) {
+ MessageQueue.init(SlaveType.Lift, lift);
+ }
+ // 鍒濆鍖栧洓鍚戠┛姊溅mq
+ for (Slave shuttle : slaveProperties.getShuttle()) {
+ MessageQueue.init(SlaveType.Shuttle, shuttle);
+ }
}
private void initThread(){
@@ -97,6 +105,20 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
+ // 鍒濆鍖栨彁鍗囨満
+ News.info("鍒濆鍖栨彁鍗囨満........................................................");
+ for (LiftSlave liftSlave : slaveProperties.getLift()) {
+ LiftThread liftThread = new LiftThread(liftSlave, redisUtil);
+ new Thread(liftThread).start();
+ SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
+ }
+ // 鍒濆鍖栧洓鍚戠┛姊溅
+ News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+ for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+ ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave,redisUtil);
+ new Thread(shuttleThread).start();
+ SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
+ }
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
--
Gitblit v1.9.1