From 5ea8ebb2dc63183018f74ef87de0bea90c87e74c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 九月 2025 17:43:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 6 +++++-
src/main/java/com/zy/asrs/controller/BasShuttleController.java | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleController.java b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
index 3bbbaa9..f005e46 100644
--- a/src/main/java/com/zy/asrs/controller/BasShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
@@ -80,8 +80,8 @@
@RequestMapping(value = "/basShuttle/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value="ids[]") Integer[] ids){
+ for (Integer id : ids){
basShuttleService.deleteById(id);
}
return R.ok();
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index e124f84..5e2e26c 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -58,6 +58,7 @@
private List<JSONObject> socketReadResults = new ArrayList<>();
private List<DeviceMsgModel> socketResults = new ArrayList<>();
+ private Long requestReadTime = System.currentTimeMillis();
//鍘熷璁惧鏁版嵁
private Object originDeviceData;
@@ -199,7 +200,10 @@
//鎸囦护瓒呰繃2鏉★紝涓嶅啀涓嬪彂浠诲姟鐘舵�佽姹�
TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, deviceConfig.getDeviceNo());
if (deviceCommandMsgListKey.size() < 2) {
- requestCommand(readStatusCommand);//璇锋眰鐘舵��
+ if ((System.currentTimeMillis() - requestReadTime) > 500) {
+ requestCommand(readStatusCommand);//璇锋眰鐘舵��
+ requestReadTime = System.currentTimeMillis();
+ }
}
if (this.socketReadResults.isEmpty()) {
--
Gitblit v1.9.1