From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvCmdService.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 00fa403..a3108b8 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
@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
import java.util.concurrent.TimeoutException;
@@ -36,16 +37,11 @@
public BaseResult<?> executeAgvActionCmd(AgvAction agvAction) {
// todo 1: 璁板綍鏃ュ織 2锛氬彂閫佷换鍔� 3锛氬悓姝ュ搷搴�
- log.info(JSON.toJSONString(agvAction));
+// News.info(JSON.toJSONString(agvAction));
String serialNo = agvAction.getSerialNo();
AgvProtocol protocol = AgvProtocol.build(agvAction.getAgvNo()).setMessageBody(agvAction.beMesBody(serialNo));
-
- // fake
- if (configService.getVal("fakeSign", Boolean.class)) {
- return BaseResult.ok();
- }
return this.requestProcess(serialNo, protocol
, (RequestSupport<AGV_01_UP>) result -> result.getSerialNo().equals(serialNo));
@@ -55,7 +51,7 @@
public BaseResult<?> executeAgvCommand(AgvCommand agvCommand) {
// todo 1: 璁板綍鏃ュ織 2锛氬彂閫佷换鍔� 3锛氬悓姝ュ搷搴�
- log.info(JSON.toJSONString(agvCommand));
+ News.info(JSON.toJSONString(agvCommand));
String serialNo = agvCommand.getSerialNo();
@@ -74,7 +70,8 @@
} else {
return BaseResult.error();
}
- } catch (TimeoutException ex){
+ } catch (TimeoutException e){
+ News.error("AgvCmdService.requestProcess", e);
return BaseResult.error();
}
}
@@ -95,7 +92,7 @@
return messageBody;
}
try{
- Thread.sleep(100);
+ Thread.sleep(10);
}catch(Exception ex){
ex.printStackTrace();
}
@@ -103,4 +100,4 @@
throw new TimeoutException();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1