From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +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 | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 d9d64c5..0fa14ab 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
@@ -1,8 +1,9 @@
package com.dy.pipIrrRemote.common;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.command.ComResultWait;
import com.dy.pipIrrGlobal.command.ComSupport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
@@ -25,18 +26,20 @@
@RequestMapping(path="comRes")
public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
- public BaseResponse<String> receive(@RequestBody Data data) {
- Long comId = 0L;
- if(data.getCommandId() != null) {
- comId = Long.parseLong(data.getCommandId());
- }
+ public void receive(@RequestBody Data data) {
+ JSONObject protocolData = data == null ? null : (JSONObject)data.subData ; //鍗忚鏁版嵁
+ JSONObject codeData = protocolData == null ? null : (protocolData.getJSONObject("subData")) ; //鍗忚鍔熻兘鐮佹暟鎹�
- CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
+ JSONObject job_response = new JSONObject();
+ job_response.put("data", codeData==null?protocolData:codeData);
+ job_response.put("commandCode", data.code);
+ job_response.put("commandId", data.commandId);
+
+ CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) ComResultWait.get(Long.parseLong(data.commandId));
if(feature != null) {
- feature.complete(data);
+ feature.complete(job_response);
}else{
- log.error("feature is null");
+ //瓒呮椂锛宖eature琚竻闄や簡
}
- return BaseResponseUtils.buildSuccess("ok");
}
}
--
Gitblit v1.8.0