From c72c95f66a00d04dd54e2b49a4f3e3766f01871f Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 09 一月 2026 15:28:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 d1ade24..fc68fc5 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -195,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);
+ }
}
//璇诲彇绔欑偣
@@ -468,27 +470,27 @@
return false;//鏈夋晠闅�
}
- if (extend.getFrontOverrun()) {
+ if (extend.getFrontOverrun() == null || extend.getFrontOverrun()) {
return false;
}
- if (extend.getBackOverrun()) {
+ if (extend.getBackOverrun() == null || extend.getBackOverrun()) {
return false;
}
- if (extend.getLeftOverrun()) {
+ if (extend.getLeftOverrun() == null || extend.getLeftOverrun()) {
return false;
}
- if (extend.getRightOverrun()) {
+ if (extend.getRightOverrun() == null || extend.getRightOverrun()) {
return false;
}
- if (extend.getOverHeight()) {
+ if (extend.getOverHeight() == null || extend.getOverHeight()) {
return false;
}
- if (extend.getOverWeight()) {
+ if (extend.getOverWeight() == null || extend.getOverWeight()) {
return false;
}
--
Gitblit v1.9.1