From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(test测试).xml | 110 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 52 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 96876da..e51b322 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"
@@ -20,24 +20,26 @@
cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
-->
<base
- orgTag="test"
- isLowPower="false"
- onlyDealRtus=""
- onlyOneProtocol="false"
- downComandMaxResendTimes="1"
- commandSendInterval="2"
- cachWaitResultTimeout="120"
- offLineCachTimeout="86400"
- lastUpDataTimeLive="500"
- dbDataIdSuffix="0"
- cacheUpDownDataWarnCount="100000"
- cacheUpDownDataMaxCount="110000"
- disconnectedByNoUpDataMinutes="3"
- workReportDealOneByTimes="5"
- 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"
/>
<!--
@@ -47,24 +49,30 @@
synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
-->
<protocol
- centerAddr="1"
- synchroRtuClock="true"
- synchroRtuClockTimepieces="300000"
+ centerAddr="1"
+ synchroRtuClock="true"
+ 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鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
<!--
鏀寔妯″潡
@@ -81,31 +89,31 @@
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"
/>
<!--
璧勬簮妯″潡
rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
- rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(KB)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
-->
<resource
- rtuLogDir="rtuLogs/"
- rtuLogFileMaxSize="1000"
- rtuLogFileMaxCount="2"
- monitorInterval="2"
- saveDbInterval="10"
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="100000"
+ rtuLogFileMaxCount="2"
+ monitorInterval="2"
+ saveDbInterval="10"
/>
@@ -120,16 +128,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