From c514b7d8ad8a3f89b81c949e265446b4f09a4bb5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 十一月 2024 16:46:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java
index 8263b1b..0436a2a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java
@@ -12,6 +12,7 @@
import com.zy.acs.common.domain.protocol.IMessageBody;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.common.utils.RequestSupport;
+import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +30,8 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private ConfigService configService;
public BaseResult<?> executeAgvActionCmd(AgvAction agvAction) {
@@ -66,7 +69,8 @@
} else {
return BaseResult.error();
}
- } catch (TimeoutException ex){
+ } catch (TimeoutException e){
+ log.error("AgvCmdService.requestProcess", e);
return BaseResult.error();
}
}
@@ -74,7 +78,7 @@
@SuppressWarnings("all")
private IMessageBody executeRequest(String serialNo, AgvProtocol protocol) throws TimeoutException {
- redis.push(RedisConstant.AGV_CMD_DOWN_FLAG, protocol);
+ redis.push(RedisConstant.AGV_PATH_DOWN_FLAG, protocol);
IMessageBody messageBody = null;
@@ -82,8 +86,8 @@
// 鑾峰彇鍝嶅簲
long startTime = System.currentTimeMillis();
while ((System.currentTimeMillis() - startTime) < RedisConstant.CMD_TIMEOUT_LIMIT) {
- if ((messageBody = redis.getObject(RedisConstant.AGV_CMD_UP_FLAG, redisKey)) != null){
- redis.deleteObject(RedisConstant.AGV_CMD_UP_FLAG, redisKey);
+ if ((messageBody = redis.getObject(RedisConstant.AGV_PATH_UP_FLAG, redisKey)) != null){
+ redis.deleteObject(RedisConstant.AGV_PATH_UP_FLAG, redisKey);
return messageBody;
}
try{
--
Gitblit v1.9.1