From 16158b89f0223db6a4501e5263f6d2817b562b09 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 14 六月 2024 13:40:36 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
index 1ef8c8d..32c9029 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.command.ComSupport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,10 +26,11 @@
public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
public BaseResponse<String> receive(@RequestBody Data data) {
- String comId = "0";
+ Long comId = 0L;
if(data.getCommandId() != null) {
- comId = data.getCommandId();
+ comId = Long.parseLong(data.getCommandId());
}
+
CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
if(feature != null) {
feature.complete(data);
--
Gitblit v1.8.0