From fdacd6f57d9ace487ee017c0a58de0a66075c9ca Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 19 六月 2024 15:45:18 +0800
Subject: [PATCH] 修改 测控阀查询接口 返回实际在线情、增加返回通讯协议、备注
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index bfb603a..644f9b7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -185,7 +185,7 @@
try {
CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
System.out.println("receive result ID:" + comId);
- Data resultData = feature.get(30, TimeUnit.SECONDS);
+ Data resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
Long commandId = Long.parseLong(resultData.getCommandId());
if(commandId.equals(comId)) {
@@ -200,7 +200,7 @@
e.printStackTrace();
return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_ERROR.getMessage());
} catch (TimeoutException e) {
- return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ return BaseResponseUtils.buildSuccess(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
}
--
Gitblit v1.8.0