From 46ea49c9452002f2c01a10fd9550339a8aaa7cd1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 18 六月 2025 14:19:15 +0800
Subject: [PATCH] 1、新了解到，FBox可接多台套水肥机、气象站、墒情站，相应修改协议（主要是主题部分）； 2、编写《水肥机、气象站、墒情站协议》（未完）。
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 0c1679a..cd1e11e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -146,6 +146,10 @@
webPort: 8089
actutorPort: 9089
idSuffix: 11
+ terminal:
+ webPort: 8090
+ actutorPort: 9090
+ idSuffix: 12
# 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
temp:
webPort: 8099
@@ -317,8 +321,8 @@
project:
#椤圭洰缂栫爜
projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
+ #鎺у埗鍣ㄧ被鍨� (01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�02锛�0x02锛�:琛ㄩ榾涓�浣撴満锛�57(0x57):浜曠數鎺у埗鍣�)
+ controllerType: 02
#榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
divisionCode: 120114403100
@@ -365,6 +369,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 #绛夊緟涓棿浠惰繑鍥炵粨鏋滆秴鏃舵椂闂达紝鍗曚綅绉掗挓
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
tokennofilter:
@@ -467,6 +472,24 @@
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/
+ requestVideoCameraTailUrl: /1.live&themeId=
+ types:
+ - 1,钀ょ煶 #1:钀ょ煶
+ #- 2,娴峰悍 #2:娴峰悍
+ #- 3,澶у崕 #3:澶у崕
+ #- 4,澶╁湴浼熶笟 #4:澶╁湴浼熶笟
+ screen:
+ count: 4 #榛樿鏄剧ず4涓棰�
#闃�鎺у櫒鍙傛暟
rtu:
signalIntensity:
--
Gitblit v1.8.0