From 9550fcfc2ac0c9c0e5c4aa0600361c4b4f908689 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 三月 2024 09:42:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 508e755..d48a654 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4101,32 +4101,36 @@
//鎵弿璁惧PakMk鏍囪鏄惁瓒呮椂
public synchronized void scanDevicePakMk() {
- //鎵弿灏忚溅
- for (ShuttleSlave slave : slaveProperties.getShuttle()) {
- NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
- NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
- continue;
+ try {
+ //鎵弿灏忚溅
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+
+ if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000 * 60 * 5)) && shuttleProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ shuttleProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
}
- if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000*60*5)) && shuttleProtocol.getPakMk()) {
- //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
- shuttleProtocol.setPakMk(false);//澶嶄綅鏍囪
- }
- }
+ //鎵弿鎻愬崌鏈�
+ for (LiftSlave slave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
- //鎵弿鎻愬崌鏈�
- for (LiftSlave slave : slaveProperties.getLift()) {
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- continue;
+ if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000 * 60 * 5)) && liftProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ liftProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
}
-
- if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000*60*5)) && liftProtocol.getPakMk()) {
- //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
- liftProtocol.setPakMk(false);//澶嶄綅鏍囪
- }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.9.1