From 628ff0ef181b27116d5dab7d973d926b4b80714b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 29 十一月 2024 14:20:43 +0800
Subject: [PATCH] agv 开关门优化
---
src/main/java/com/zy/controller/OpenController.java | 4 ++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/controller/OpenController.java b/src/main/java/com/zy/controller/OpenController.java
index 58a667f..6106853 100644
--- a/src/main/java/com/zy/controller/OpenController.java
+++ b/src/main/java/com/zy/controller/OpenController.java
@@ -64,7 +64,11 @@
staProtocol305.setOpenAskDoor(false);
wrkMast.setWhsType(4);
wrkMastService.updateById(wrkMast);
+ } else {
+ return R.ok("宸茬粡璇锋眰杩囧叧闂細" + staProtocol305.getIfCloseDoor());
}
+ } else {
+ return R.parse("璇锋眰鍏抽棬寮傚父,褰撳墠鐘舵�佷负锛�" + wrkMast.getWhsType());
}
} else {
return R.parse("鏃犱换鍔�");
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 723985c..d884e92 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -26,10 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -133,6 +130,7 @@
booleans[1] = true; // 鍏抽棬淇″彿
booleans[0] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂鍏抽棬淇″彿鎴愬姛锛�" + Arrays.toString(booleans));
}
} else if(flag == 1) {
OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
@@ -141,6 +139,7 @@
booleans[0] = true; // 寮�闂ㄤ俊鍙�
booleans[1] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂寮�闂ㄤ俊鍙锋垚鍔燂細" + Arrays.toString(booleans));
}
}
Thread.sleep(500);
@@ -157,6 +156,7 @@
staProtocol.setCloseAskDoor(booleans[1]);
staProtocol.setIfOpenDoor(booleans[2]);
staProtocol.setIfCloseDoor(booleans[3]);
+ log.info("涓嬪彂寮�鍏抽棬鍚庡洖璇伙細" + Arrays.toString(booleans));
}
}
--
Gitblit v1.9.1