From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index ae6c33d..51c1832 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -183,25 +183,52 @@
// } else
if (jarProtocol.statusType .equals(JarStatusType.SOS2)){
jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+ if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
+ if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
+ if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
+ jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+ jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+ }
+ }
+ if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
+ if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
+ jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+ jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ }
+ }
+ }
} else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){
jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
} else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){
jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
- }
+ } else if (jarProtocol.leftDoorOpen==1 || jarProtocol.leftDoorClose==1 ||
+ jarProtocol.rightDoorOpen==1 || jarProtocol.rightDoorClose==1){
- if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
- if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
+ } else {
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2)){
+
+ if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
+ jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+ jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ }
if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
}
- }
- }
- if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) {
- if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
- if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
- jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
- jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ } else if (jarProtocol.statusType .equals(JarStatusType.WAITING1) || jarProtocol.statusType .equals(JarStatusType.MOVING)){
+ if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) {
+ if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
+ if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
+ jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+ jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ }
+ }
+ }
+ if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
+ if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
+ jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+ jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+ }
}
}
}
--
Gitblit v1.9.1