From f5a7f6c30bc5fb13eb538b5856a663b1ba0667b6 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:06 +0800
Subject: [PATCH] 2024-05-27 朱宝民 远程开关阀、RTU在线情况
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
similarity index 66%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/CommandResultCtrl.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
index 4e605a7..1ef8c8d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrRemote.rtu;
+package com.dy.pipIrrRemote.common;
import com.dy.common.mw.protocol.Data;
import com.dy.common.webUtil.BaseResponse;
@@ -10,6 +10,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.concurrent.CompletableFuture;
+
/**
* @author ZhuBaoMin
* @date 2024-05-23 8:19
@@ -20,10 +22,17 @@
@Slf4j
@RestController
@RequestMapping(path="comRes")
-public class CommandResultCtrl {
+public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
public BaseResponse<String> receive(@RequestBody Data data) {
- log.info(data.toString()) ;
+ String comId = "0";
+ if(data.getCommandId() != null) {
+ comId = data.getCommandId();
+ }
+ CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
+ if(feature != null) {
+ feature.complete(data);
+ }
return BaseResponseUtils.buildSuccess("ok");
}
}
--
Gitblit v1.8.0