From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
index 2973292..a76414a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
@@ -3,7 +3,9 @@
import com.dy.common.contant.Constant;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol4Mqtt.MqttSubMsg;
import com.dy.rtuMw.server.ServerProperties;
+import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@
* @LastEditTime 2023/12/21 20:28
* @Description 閫氫俊涓棿浠跺澶栬繘琛寃eb璋冪敤锛屾妸鍛戒护缁撴灉鍙戦�佸嚭鍘�
*/
+@Slf4j
@Component()
public class CommandResultDeal {
@@ -33,6 +36,10 @@
this.restTemplate = restTemplate ;
}
+ /**
+ * RTU璁惧鏁版嵁
+ * @param data
+ */
public void deal(Data data) {
if (data.rtuResultSendWebUrl != null
&& !data.rtuResultSendWebUrl.trim().equals("")
@@ -43,7 +50,7 @@
restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
- headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag);
+ headers.set(Constant.TokenKeyInHeader, ServerProperties.orgTag);
HttpEntity<?> httpEntity = new HttpEntity<>(data, headers);
ResponseEntity<WebResponseVo> response = null;
try {
@@ -58,4 +65,34 @@
log.error("涓ラ噸閿欒锛屽湪com.dy.aceMw.web.comResult.CommandResultDeal閲岋紝澶勭悊鐨勬槸RTU鍛戒护缁撴灉Node锛屼絾鏁版嵁涓璻tuResultSendWebUrl涓虹┖");
}
}
+
+ /**
+ * Mqtt娑堟伅鏁版嵁
+ * @param subMsg
+ */
+ public void deal(MqttSubMsg subMsg) {
+ if (subMsg.mqttResultSendWebUrl != null
+ && !subMsg.mqttResultSendWebUrl.trim().equals("")
+ && !subMsg.mqttResultSendWebUrl.trim().equals(Command.ignoreRtuResultSendWebUrl)) {
+ String url = UriComponentsBuilder.fromUriString(subMsg.mqttResultSendWebUrl)
+ .build()
+ .toUriString();
+ restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
+ headers.set(Constant.TokenKeyInHeader, ServerProperties.orgTag);
+ HttpEntity<?> httpEntity = new HttpEntity<>(subMsg, headers);
+ ResponseEntity<WebResponseVo> response = null;
+ try {
+ // 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
+ response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, WebResponseVo.class);
+ } catch (Exception e) {
+ log.error("鍛戒护缁撴灉鍥炶皟鍙戠敓寮傚父", e);
+ e.printStackTrace();
+ }
+ //assert response != null;
+ } else {
+ log.error("涓ラ噸閿欒锛屽湪com.dy.aceMw.web.comResult.CommandResultDeal閲岋紝澶勭悊鐨勬槸RTU鍛戒护缁撴灉Node锛屼絾鏁版嵁涓璻tuResultSendWebUrl涓虹┖");
+ }
+ }
}
--
Gitblit v1.8.0