From 5fcdef2e8eec55221bb65a7a2cf91a4be7cc89ac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 02 十二月 2024 16:41:11 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml index b9031ee..263c8f3 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml @@ -24,12 +24,12 @@ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級 --> <base - orgTag="sp" + orgTag="ym" isLowPower="false" onlyDealRtus="" onlyOneProtocol="false" downComandMaxResendTimes="1" - commandSendInterval="2" + commandSendInterval="3" cachWaitResultTimeout="120" offLineCachTimeout="86400" lastUpDataTimeLive="500" @@ -54,19 +54,21 @@ synchroRtuClockTimepieces="300000" /> - - <!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤 - 杞欢鍗囩骇 --> - <updateRtuSoft enable="true"> - <soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" > - <newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion> - </soft1> - <!-- - <soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" > - <newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion> - </soft2> - --> - </updateRtuSoft> + <!-- RTU 杞欢鍗囩骇 + enable: 妯″潡鏄惁鍚姩 + noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓 + failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇 + ugMaxRtuAtOnce锛氫负浜嗙紦瑙i�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒� + rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴� + notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛� + --> + <upgrade enable="true" + noOneRtuUpgradeMaxDuration="1200" + failTryTimes="2" + ugMaxRtuAtOnce="5000" + rtuOffLineWaitDuration="1800" + notifyStateInterval="2" + /> <!-- 鏀寔妯″潡 @@ -122,14 +124,12 @@ /> <!-- - sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛� - sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛� + coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級 queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲� queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲� --> <core - sleepBigBusy="100" - sleepSmallBusy="500" + coreInterval="100" queueWarnSize="100000" queueMaxSize="300000" /> @@ -140,7 +140,7 @@ idle: 鍙戝憜鏃堕暱锛堢锛� --> <tcp enable="true" - port="62000" + port="60000" processors="3" idle="10" /> -- Gitblit v1.8.0