From dfe65c30a3fa372af98e8341ea46b1c4bf7cc725 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 11:35:55 +0800
Subject: [PATCH] 增补属性的json中的顺序
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(test测试).xml | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
index 1d9e0bb..f399cc7 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
@@ -24,22 +24,22 @@
sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
-->
<base
- orgTag="test"
- isLowPower="false"
- onlyDealRtus=""
- onlyOneProtocol="false"
- downComandMaxResendTimes="1"
- commandSendInterval="10"
- cachWaitResultTimeout="120"
- offLineCachTimeout="86400"
- lastUpDataTimeLive="500"
- dbDataIdSuffix="0"
- cacheUpDownDataWarnCount="100000"
- cacheUpDownDataMaxCount="110000"
- disconnectedByNoUpDataMinutes="3"
- workReportDealOneByTimes="5"
- intakeAlarmLossMinValue="1.0"
- sendDingDingAlarmMsInterval="60"
+ orgTag="test"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ cachWaitResultTimeout="120"
+ offLineCachTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="5"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
/>
<!--
@@ -49,16 +49,34 @@
synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
-->
<protocol
- centerAddr="1"
- synchroRtuClock="true"
- synchroRtuClockTimepieces="300000"
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
/>
<!-- RTU 杞欢鍗囩骇
enable: 妯″潡鏄惁鍚姩
- failTryTimes锛氬崌绾уけ璐ュ悗锛岄噸鏂板伩璇曞崌绾ф鏁帮紝0琛ㄧず涓嶉噸鏂板伩璇曞崌绾�
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
-->
- <upgrade enable="true" failTryTimes="0" ugMaxRtuSameTime="1000" />
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
<!--
鏀寔妯″潡
@@ -75,15 +93,15 @@
enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
-->
<support
- short_maxThread="6"
- short_minThread="6"
- short_freeTimeout="60"
- short_busyTimeout="5"
- long_maxThread="6"
- long_minThread="6"
- long_freeTimeout="60"
- long_busyTimeout="-1"
- enableThreadPool="true"
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
/>
<!--
@@ -95,11 +113,11 @@
saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
-->
<resource
- rtuLogDir="rtuLogs/"
- rtuLogFileMaxSize="100000"
- rtuLogFileMaxCount="2"
- monitorInterval="2"
- saveDbInterval="10"
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="100000"
+ rtuLogFileMaxCount="2"
+ monitorInterval="2"
+ saveDbInterval="10"
/>
@@ -114,16 +132,14 @@
/>
<!--
- sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
- sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
-->
<core
- sleepBigBusy="100"
- sleepSmallBusy="500"
- queueWarnSize="100000"
- queueMaxSize="300000"
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
/>
<!--
--
Gitblit v1.8.0