From 21de9eefe1a98ba0f154febf268d551600deff04 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 23 六月 2025 17:25:16 +0800 Subject: [PATCH] 1、配置文件增加MQTT远程命令结果回调URL; 2、MQTT远程命令bug修改; 3、增加两说明文档; 4、配置文件规范。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java index b80ae41..45b05fe 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson2.JSONObject; import com.dy.common.mw.protocol.Command; +import com.dy.common.util.Callback; import com.dy.common.util.IDLongGenerator; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; @@ -155,11 +156,11 @@ * 鍙戦�佸懡浠ゅ悗 * @return */ - public BaseResponse<Object> after(String comCode) { + public BaseResponse<Object> after(String comCode, Callback callback) { try{ //绛夊緟閫氫俊涓棿浠堕�氱煡鎺у埗鍣ㄦ墽琛屽懡浠や笂琛屾暟鎹紙鍛戒护缁撴灉锛� JSONObject resultData = feature.get(waitMwRtnResultTimeout, TimeUnit.SECONDS); - return BaseResponseUtils.buildSuccess(this.createRtnMsg(comCode, resultData)); + return BaseResponseUtils.buildSuccess(this.dealComResult(comCode, resultData, callback)); }catch (Exception e){ return BaseResponseUtils.buildFail("绛夊緟閫氫俊涓棿浠堕�氱煡鍛戒护缁撴灉瓒呮椂"); } @@ -189,5 +190,5 @@ /** * 鐢熸垚鍛戒护杩斿洖淇℃伅 */ - protected abstract String createRtnMsg(String code, JSONObject resultData); + protected abstract String dealComResult(String code, JSONObject resultData, Callback callback); } -- Gitblit v1.8.0