From 3cba497c498c3833fdc266d99e07bc3c2d16e658 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 09:02:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/impl/NormalLedThread.java | 1 -
src/main/webapp/views/index.html | 2 +-
src/main/java/com/zy/core/cache/MessageQueue.java | 8 ++++++++
src/main/java/com/zy/core/MainProcess.java | 4 ++--
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 2 +-
src/main/java/com/zy/core/ServerBootstrap.java | 12 +++---------
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 23ffc9c..51ace7f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,9 +43,9 @@
//zhangc
//杈撻�佺嚎
// 鍏ュ簱
- mainService.generateInboundWrk();
+ // mainService.generateInboundWrk();
// 鍑哄簱
- mainService.stnToOutStn();
+ // mainService.stnToOutStn();
//鍒濆鍖栧疄鏃跺湴鍥�
mainService.initRealtimeBasMap();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 73cd386..5461319 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -128,21 +128,15 @@
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, devpSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Devp, devpSlave.getId(), thread);
}
// 鍒濆鍖栫數瑙嗘満
for (LedSlave ledSlave : slaveProperties.getLed()) {
News.info("鍒濆鍖栫數瑙嗘満......................................................");
- ThreadHandler thread = null;
- if (ledSlave.getThreadImpl().equals("NormalLedThread")) {
- thread = new NormalLedThread(ledSlave);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
-
+ ThreadHandler thread = new NormalLedThread(ledSlave);
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, ledSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Led, ledSlave.getId(), thread);
}
}
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index 2659aa4..d5c4d08 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -93,8 +93,16 @@
case Lift:
return LIFT_EXCHANGE.get(id).poll();
case Devp:
+ ConcurrentLinkedQueue<Task> tasks = DEVP_EXCHANGE.get(id);
+ if (tasks == null) {
+ return null;
+ }
return DEVP_EXCHANGE.get(id).poll();
case Led:
+ ConcurrentLinkedQueue<Task> task2 = LED_EXCHANGE.get(id);
+ if (task2 == null) {
+ return null;
+ }
return LED_EXCHANGE.get(id).poll();
default:
return null;
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 3625152..36cb2a9 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -78,7 +78,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
-// connect();
+ connect();
while (true) {
try {
int step = 1;
diff --git a/src/main/java/com/zy/core/thread/impl/NormalLedThread.java b/src/main/java/com/zy/core/thread/impl/NormalLedThread.java
index 5a8635c..6921595 100644
--- a/src/main/java/com/zy/core/thread/impl/NormalLedThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NormalLedThread.java
@@ -38,7 +38,6 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
-// connect();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 3c8b4f5..0aa746f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -19,7 +19,7 @@
<div class="nav">
<ul class="cl-effect-4">
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
- <li><a id="pipline" onclick="nav(this.id)" class="nav-select" href="#">杈撻�佺嚎</a></li>
+ <li><a id="pipeline" onclick="nav(this.id)" class="nav-select" href="#">杈撻�佺嚎</a></li>
<li><a id="lift" onclick="nav(this.id)" class="nav-unselect" href="#">鎻愬崌鏈�</a></li>
<li><a id="shuttle" onclick="nav(this.id)" class="nav-unselect" href="#">鍥涘悜绌挎杞�</a></li>
<li><a id="admin" onclick="nav(this.id)" class="nav-unselect" href="#">绠＄悊鍚庡彴</a></li>
--
Gitblit v1.9.1