From dfdf0455cb9f8f9fdbb0fa3e45db09f56cac1e5d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 09 一月 2026 10:52:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 148 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 106 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index 9a49e55..fc68fc5 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -85,7 +85,7 @@
try {
listenMessageFromRedis();
readStatus();
- Thread.sleep(100);
+ Thread.sleep(200);
} catch (Exception e) {
log.error("LiftThread Fail", e);
}
@@ -93,13 +93,18 @@
});
readThread.start();
- while (true) {
- try {
- execute();
- } catch (Exception e) {
- e.printStackTrace();
+ //璁惧鎵ц
+ Thread executeThread = new Thread(() -> {
+ while (true) {
+ try {
+ execute();
+ Thread.sleep(200);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- }
+ });
+ executeThread.start();
}
private void execute() {
@@ -190,17 +195,19 @@
InnerLiftExtend liftExtend = (InnerLiftExtend) liftProtocol.getExtend();
liftProtocol.setExtend(liftExtend);
JSONObject extend = data.getJSONObject("extend");
- liftExtend.setFrontOverrun(extend.getInteger("frontOverrun") == 1);
- liftExtend.setBackOverrun(extend.getInteger("backOverrun") == 1);
- liftExtend.setLeftOverrun(extend.getInteger("leftOverrun") == 1);
- liftExtend.setRightOverrun(extend.getInteger("rightOverrun") == 1);
- liftExtend.setOverHeight(extend.getInteger("overHeight") == 1);
- liftExtend.setOverWeight(extend.getInteger("overWeight") == 1);
- liftExtend.setPlcTaskNoComplete(extend.getInteger("plcTaskNoComplete"));
+ if (extend != null) {
+ liftExtend.setFrontOverrun(extend.getInteger("frontOverrun") == 1);
+ liftExtend.setBackOverrun(extend.getInteger("backOverrun") == 1);
+ liftExtend.setLeftOverrun(extend.getInteger("leftOverrun") == 1);
+ liftExtend.setRightOverrun(extend.getInteger("rightOverrun") == 1);
+ liftExtend.setOverHeight(extend.getInteger("overHeight") == 1);
+ liftExtend.setOverWeight(extend.getInteger("overWeight") == 1);
+ liftExtend.setPlcTaskNoComplete(extend.getInteger("plcTaskNoComplete"));
- if (!liftExtend.getPlcTaskNoComplete().equals(liftProtocol.getPlcTaskNo())) {
- //璁惧鐘舵��
- liftProtocol.setDeviceStatus(LiftDeviceStatusType.BUSY.id);
+ if (!liftExtend.getPlcTaskNoComplete().equals(liftProtocol.getPlcTaskNo())) {
+ //璁惧鐘舵��
+ liftProtocol.setDeviceStatus(LiftDeviceStatusType.BUSY.id);
+ }
}
//璇诲彇绔欑偣
@@ -380,20 +387,51 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
- boolean res = this.liftProtocol.getProtocolStatus() == LiftProtocolStatusType.IDLE.id
-// && this.liftProtocol.getPlcTaskNo() == 0
- && this.liftProtocol.getTaskNo() == 0
- && this.liftProtocol.getModel() == 2
- && this.liftProtocol.getDeviceStatus() == LiftDeviceStatusType.IDLE.id
- && this.liftProtocol.getErrorCode() == 0
- && !extend.getFrontOverrun()
- && !extend.getBackOverrun()
- && !extend.getLeftOverrun()
- && !extend.getRightOverrun()
- && !extend.getOverHeight()
- && !extend.getOverWeight()
- ;
- return res;
+ if (this.liftProtocol.getProtocolStatus() != LiftProtocolStatusType.IDLE.id) {
+ return false;//浠诲姟涓嶇┖闂�
+ }
+
+ if (this.liftProtocol.getTaskNo() != 0) {
+ return false;//鏈変换鍔″彿
+ }
+
+ if (this.liftProtocol.getModel() != 2) {
+ return false;//闈炶嚜鍔�
+ }
+
+ if (this.liftProtocol.getDeviceStatus() != LiftDeviceStatusType.IDLE.id) {
+ return false;//闈炵┖闂�
+ }
+
+ if (this.liftProtocol.getErrorCode() != 0) {
+ return false;//鏈夋晠闅�
+ }
+
+ if (extend.getFrontOverrun()) {
+ return false;
+ }
+
+ if (extend.getBackOverrun()) {
+ return false;
+ }
+
+ if (extend.getLeftOverrun()) {
+ return false;
+ }
+
+ if (extend.getRightOverrun()) {
+ return false;
+ }
+
+ if (extend.getOverHeight()) {
+ return false;
+ }
+
+ if (extend.getOverWeight()) {
+ return false;
+ }
+
+ return true;
}
@Override
@@ -420,17 +458,43 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
- boolean res = this.liftProtocol.getModel() == 2
- && this.liftProtocol.getDeviceStatus() == LiftDeviceStatusType.IDLE.id
- && this.liftProtocol.getErrorCode() == 0
- && !extend.getFrontOverrun()
- && !extend.getBackOverrun()
- && !extend.getLeftOverrun()
- && !extend.getRightOverrun()
- && !extend.getOverHeight()
- && !extend.getOverWeight()
- ;
- return res;
+ if (this.liftProtocol.getModel() != 2) {
+ return false;//闈炶嚜鍔�
+ }
+
+ if (this.liftProtocol.getDeviceStatus() != LiftDeviceStatusType.IDLE.id) {
+ return false;//闈炵┖闂�
+ }
+
+ if (this.liftProtocol.getErrorCode() != 0) {
+ return false;//鏈夋晠闅�
+ }
+
+ if (extend.getFrontOverrun() == null || extend.getFrontOverrun()) {
+ return false;
+ }
+
+ if (extend.getBackOverrun() == null || extend.getBackOverrun()) {
+ return false;
+ }
+
+ if (extend.getLeftOverrun() == null || extend.getLeftOverrun()) {
+ return false;
+ }
+
+ if (extend.getRightOverrun() == null || extend.getRightOverrun()) {
+ return false;
+ }
+
+ if (extend.getOverHeight() == null || extend.getOverHeight()) {
+ return false;
+ }
+
+ if (extend.getOverWeight() == null || extend.getOverWeight()) {
+ return false;
+ }
+
+ return true;
}
@Override
--
Gitblit v1.9.1