From d749f488a802175dfa10851ebdffdb15c9bdeba8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期日, 24 十二月 2023 13:26:40 +0800
Subject: [PATCH] #提升机
---
src/main/java/com/zy/core/thread/LiftThread.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index d61e0fa..a9f40e5 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -351,11 +351,15 @@
return false;
}
- BasLiftOptService basLiftOptService = SpringUtils.getBean(BasLiftOptService.class);
- BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());
- if (basLiftOpt != null) {
- wrkNo = basLiftOpt.getWrkNo().shortValue();
+ if (wrkNo >= 20000 && wrkNo <= 30000) {
+ //鎻愬崌鏈鸿澶囧伐浣滃彿锛岄渶瑕佹煡璇㈠搴斾换鍔″彿
+ BasLiftOptService basLiftOptService = SpringUtils.getBean(BasLiftOptService.class);
+ BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString(), liftProtocol.getLiftNo().intValue());
+ if (basLiftOpt != null) {
+ wrkNo = basLiftOpt.getWrkNo().shortValue();
+ }
}
+
Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
if (o == null) {
return false;
--
Gitblit v1.9.1