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-global/src/main/resources/application-global.yml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 f1ca69d..327f79b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -118,10 +118,6 @@
webPort: 8083
actutorPort: 9083
idSuffix: 5
- demo:
- webPort: 8000
- actutorPort: 9000
- idSuffix: 99
sell:
webPort: 8084
actutorPort: 9084
@@ -150,11 +146,19 @@
webPort: 8090
actutorPort: 9090
idSuffix: 12
+ model:
+ webPort: 8091
+ actutorPort: 9091
+ idSuffix: 13
# 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
temp:
webPort: 8099
actutorPort: 9099
idSuffix: 98
+ demo:
+ webPort: 8000
+ actutorPort: 9000
+ idSuffix: 99
# 鍒嗗竷寮弚eb鏂囦欢绯荤粺
file:
@@ -374,7 +378,7 @@
ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
#寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
- waitMwRtnResultTimeout: 60 #绛夊緟涓棿浠惰繑鍥炵粨鏋滆秴鏃舵椂闂达紝鍗曚綅绉掗挓
+ waitMwRtnResultTimeout: 10 #绛夊緟涓棿浠惰繑鍥炵粨鏋滆秴鏃舵椂闂达紝鍗曚綅绉掗挓
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
tokennofilter:
@@ -394,6 +398,11 @@
startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
+#妯″瀷璁＄畻閰嶇疆锛屾ā鍨嬭绠楀畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
+model-calculate:
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁ModelListener涓嚜鍔ㄨ缃垚0
+ startMinute: 10 #寮�濮嬪垎閽� 10
+
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
ym:
--
Gitblit v1.8.0