From a757961fc5b8f5ee5b79cc30615bd22d321d0d72 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 05 七月 2025 17:01:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 153 ++++++++++++++++++++++++++-------------------------
1 files changed, 78 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 85bb881..b2a3c33 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,15 +1,16 @@
package com.zy.core;
+import com.alibaba.fastjson.JSON;
+import com.zy.common.exception.CoolException;
+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.properties.SlaveProperties;
-import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.CarThread;
-import com.zy.core.thread.SiemensCrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.properties.DeviceConfig;
+import com.zy.core.thread.impl.LfdZyForkLiftMasterThread;
+import com.zy.core.thread.impl.NyShuttleThread;
+import com.zy.core.utils.DeviceMsgUtils;
+import com.zy.core.utils.FakeDeviceUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -17,6 +18,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.List;
/**
* Created by vincent on 2020/8/4
@@ -26,96 +28,73 @@
public class ServerBootstrap {
@Autowired
- private SlaveProperties slaveProperties;
+ private RedisUtil redisUtil;
@Autowired
- private MainProcess mainProcess;
+ private DeviceMsgUtils deviceMsgUtils;
+ @Autowired
+ private FakeDeviceUtils fakeDeviceUtils;
@PostConstruct
@Async
public void init() throws InterruptedException {
- log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
- // 寮�濮嬩富娴佺▼杩涚▼
- mainProcess.start();
- log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+ // 鍒濆鍖栬櫄鎷熻澶囩嚎绋�
+ initFakeThread();
+ News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
private void initMq(){
- // 鍒濆鍖栧爢鍨涙満mq
- for (Slave crn : slaveProperties.getCrn()) {
- MessageQueue.init(SlaveType.Crn, crn);
+ // 鍒濆鍖栬澶噈q
+ String deviceConfig = deviceMsgUtils.getDeviceConfig();
+ if(null == deviceConfig){
+ News.error("鍒濆鍖栬澶囨椂鏈娴嬪埌閰嶇疆鏂囦欢...................");
+ return;
}
- // 鍒濆鍖栬緭閫佺嚎mq
- for (Slave devp : slaveProperties.getDevp()) {
- MessageQueue.init(SlaveType.Devp, devp);
- }
- // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
- for (Slave barcode : slaveProperties.getBarcode()) {
- MessageQueue.init(SlaveType.Barcode, barcode);
- }
- // 鍒濆鍖朙ed鐏痬q
- for (Slave led : slaveProperties.getLed()) {
- MessageQueue.init(SlaveType.Led, led);
- }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
- // 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
+
+ List<DeviceConfig> deviceConfigs = JSON.parseArray(deviceConfig, DeviceConfig.class);
+ for (DeviceConfig device : deviceConfigs) {
+ SlaveType type = SlaveType.findInstance(device.getDeviceType());
+ if(null == type){
+ continue;
+ }
+ MessageQueue.init(type, device.getDeviceNo());
}
}
private void initThread(){
- // 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = null;
- switch (crn.getId()) {
- case 1:
- crnThread = new SiemensCrnThread(crn);
- break;
- default:
- break;
+ String deviceConfig = deviceMsgUtils.getDeviceConfig();
+ if(null == deviceConfig){
+ News.error("鍒濆鍖栬澶囨椂鏈娴嬪埌閰嶇疆鏂囦欢...................");
+ return;
+ }
+
+ List<DeviceConfig> deviceConfigs = JSON.parseArray(deviceConfig, DeviceConfig.class);
+ for (DeviceConfig device : deviceConfigs) {
+ if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
+ initForkLiftThread(device);
+ } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+ initShuttleThread(device);
}
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
+ }
- // 鍒濆鍖栬緭閫佺嚎绾跨▼
- log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
- }
-
- // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
- log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
- new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
- // 鍒濆鍖朙ED绾跨▼
-// log.info("鍒濆鍖朙ED绾跨▼...................................................");
-// for (LedSlave led : slaveProperties.getLed()) {
-// LedThread ledThread = new LedThread(led);
-// new Thread(ledThread).start();
-// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-// }
- // 鍒濆鍖栧彴杞︾嚎绋�
- log.info("鍒濆鍖栧彴杞︾嚎绋�...................................................");
- for (Slave car : slaveProperties.getCar()) {
- CarThread carThread = new CarThread(car);
- new Thread(carThread).start();
- SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+ private void initFakeThread(){
+ String fakeDeviceConfig = fakeDeviceUtils.getFakeDeviceConfig();
+ if(null != fakeDeviceConfig){
+ List<DeviceConfig> deviceConfigs = JSON.parseArray(fakeDeviceConfig, DeviceConfig.class);
+ for (DeviceConfig device : deviceConfigs) {
+ if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
+ initForkLiftThread(device);
+ } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+ initShuttleThread(device);
+ }
+ }
}
}
@@ -124,5 +103,29 @@
public void destroy() {
}
+ private void initForkLiftThread(DeviceConfig deviceConfig) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
+ thread = new LfdZyForkLiftMasterThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.ForkLiftMaster, deviceConfig.getDeviceNo(), thread);
+ }
+
+ private void initShuttleThread(DeviceConfig deviceConfig) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
+ thread = new NyShuttleThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Shuttle, deviceConfig.getDeviceNo(), thread);
+ }
+
}
--
Gitblit v1.9.1