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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 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 2fffebe..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
@@ -146,11 +142,23 @@
webPort: 8089
actutorPort: 9089
idSuffix: 11
+ terminal:
+ 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:
@@ -317,8 +325,8 @@
project:
#椤圭洰缂栫爜
projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
+ #鎺у埗鍣ㄧ被鍨� (01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�02锛�0x02锛�:琛ㄩ榾涓�浣撴満锛�57(0x57):浜曠數鎺у埗鍣�)
+ controllerType: 02
#榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
divisionCode: 120114403100
@@ -357,14 +365,20 @@
jc:
url: "http://127.0.0.1:8105"
comSendUrl: "http://127.0.0.1:8105/rtuMw/com/send"
+ jyg:
+ url: "http://127.0.0.1:8106"
+ comSendUrl: "http://127.0.0.1:8106/rtuMw/com/send"
#Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+ #MQTT杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
+ mqttCallbackUrl_rm: "http://127.0.0.1:8081/remote/mqttRes/receive"
#鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
#rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧�
ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
#寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
+ waitMwRtnResultTimeout: 10 #绛夊緟涓棿浠惰繑鍥炵粨鏋滆秴鏃舵椂闂达紝鍗曚綅绉掗挓
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
tokennofilter:
@@ -383,6 +397,11 @@
auto-statistics:
startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
+
+#妯″瀷璁＄畻閰嶇疆锛屾ā鍨嬭绠楀畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
+model-calculate:
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁ModelListener涓嚜鍔ㄨ缃垚0
+ startMinute: 10 #寮�濮嬪垎閽� 10
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
@@ -466,7 +485,34 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ jyg:
+ enable: false #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+#瑙嗛鐩戞帶鐩稿叧
+video:
+ #钀ょ煶浜戝紑鏀惧钩鍙�
+ ys:
+ accessTokenExpireDay: 7 #AccessToken杩囨湡鏃堕棿锛屽崟浣嶅ぉ
+ appKey: 93987fd687444c23b427181a108f5253
+ secret: d73a08e4fb3c3d9d0b696630eea8bd4e
+ requestAccessTokenUrl: https://open.ys7.com/api/lapp/token/get
+ requestVideoCommonUrl: https://open.ys7.com/console/jssdk/pc.html
+ requestVideoCameraPreUrl: ezopen://open.ys7.com/
+ requestVideoCameraTail4LiveUrl: /1.live
+ requestVideoCameraTail4ThemeIdUrl: themeId=
+ types:
+ - 1,钀ょ煶 #1:钀ょ煶
+ #- 2,娴峰悍 #2:娴峰悍
+ #- 3,澶у崕 #3:澶у崕
+ #- 4,澶╁湴浼熶笟 #4:澶╁湴浼熶笟
+ screen:
+ count: 4 #榛樿鏄剧ず4涓棰�
#闃�鎺у櫒鍙傛暟
rtu:
signalIntensity:
@@ -477,4 +523,4 @@
#铏氭嫙鍗￠厤缃弬鏁�
vc:
#铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
- alarmValue: 10
\ No newline at end of file
+ alarmValue: 10
--
Gitblit v1.8.0