From c8b6006793c57e14ec25beaa746205d2ffdc2b02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 八月 2025 15:57:31 +0800
Subject: [PATCH] 微信小程序后端模块（子系统）增加接收农业综合站（水肥、气象、墒情）接收命令结果的业务逻辑
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/common/Com4MqttCtrl.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/MqttResultCtrl.java | 38 ++++++++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2 ++
3 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 327f79b..074ba03 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -378,6 +378,8 @@
ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
#寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
+ #MQTT杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
+ mqttCallbackUrl_wx: "http://127.0.0.1:8087/wx/mqttRes/receive"
waitMwRtnResultTimeout: 10 #绛夊緟涓棿浠惰繑鍥炵粨鏋滆秴鏃舵椂闂达紝鍗曚綅绉掗挓
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/MqttResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/MqttResultCtrl.java
new file mode 100644
index 0000000..59bab7f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/MqttResultCtrl.java
@@ -0,0 +1,38 @@
+package com.dy.pipIrrWechat.command;
+
+import com.dy.common.mw.protocol4Mqtt.MqttSubMsg;
+import com.dy.pipIrrGlobal.command.ComResultWait;
+import com.dy.pipIrrGlobal.command.ComSupport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025/8/21 14:50
+ * @Description
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(path="mqttRes")
+public class MqttResultCtrl extends ComSupport {
+ @PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
+ public void receive(@RequestBody MqttSubMsg subMsg) {
+ if(subMsg != null){
+ CompletableFuture<MqttSubMsg> feature = (CompletableFuture<MqttSubMsg>) ComResultWait.get(Long.parseLong(subMsg.commandId));
+ if(feature != null) {
+ feature.complete(subMsg);
+ }else{
+ //瓒呮椂锛宖eature琚竻闄や簡
+ }
+ }else{
+ log.error("mqtt鍗忚娑堟伅涓虹┖");
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/common/Com4MqttCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/common/Com4MqttCtrl.java
index f2d0347..b60e182 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/common/Com4MqttCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/common/Com4MqttCtrl.java
@@ -36,7 +36,7 @@
@Value("${mw.waitMwRtnResultTimeout}")
protected int waitMwRtnResultTimeout ;
- @Value("${mw.mqttCallbackUrl_rm}")
+ @Value("${mw.mqttCallbackUrl_wx}")
protected String mqttResultSendWebUrl;
//姘磋偉鏈哄璞�
--
Gitblit v1.8.0