From 5dec8dcc45b40a1d7acdf05be2f2ffd00759535e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 07 六月 2025 16:11:30 +0800 Subject: [PATCH] 1、*-global.yml配置文件中增加有关萤石云应用的配置; 2、萤石云视频监控相关数据库设计(萤石应用+视频监控站); 3、remote模块增加定时下载萤石应用AccessToken的监听器,及网络下载逻辑,数据库存储等功能实现; --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 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 3b5e962..5f0b6b9 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 @@ -12,9 +12,10 @@ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁� downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1 commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�) - cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜� - offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�) - lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂) + fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗 + cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜� + offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�) + lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉� dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1 cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧 cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧 @@ -24,20 +25,21 @@ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級 --> <base - orgTag="ym" + orgTag="${base.orgTag}" isLowPower="false" onlyDealRtus="" onlyOneProtocol="false" downComandMaxResendTimes="1" commandSendInterval="3" - cachWaitResultTimeout="120" - offLineCachTimeout="86400" + fastCommandSendInterval="500" + cacheWaitResultTimeout="120" + offLineCacheTimeout="86400" lastUpDataTimeLive="500" dbDataIdSuffix="0" cacheUpDownDataWarnCount="100000" cacheUpDownDataMaxCount="110000" - disconnectedByNoUpDataMinutes="3" - workReportDealOneByTimes="5" + disconnectedByNoUpDataMinutes="${base.upData.min.interval}" + workReportDealOneByTimes="1" intakeAlarmLossMinValue="1.0" sendDingDingAlarmMsInterval="60" /> @@ -52,6 +54,14 @@ centerAddr="1" synchroRtuClock="true" synchroRtuClockTimepieces="300000" + /> + + <!-- RTU 娑堟伅涓績 + enable: 妯″潡鏄惁鍚姩 + notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛� + --> + <msCenter enable="true" + notifyInterval="5" /> <!-- RTU 杞欢鍗囩骇 @@ -116,7 +126,7 @@ <resource rtuLogDir="rtuLogs/" rtuLogFileMaxSize="1000000" - rtuLogFileMaxCount="2" + rtuLogFileMaxCount="3" monitorInterval="2" saveDbInterval="10" /> @@ -149,9 +159,27 @@ idle: 鍙戝憜鏃堕暱锛堢锛� --> <tcp enable="true" - port="60000" + port="${tcp.port}" processors="3" idle="10" /> + + <!-- + topicAndQos: 涓婚涓嶲os锛屼富棰樺悕涓庡叾Qos鐢ㄩ�楀彿闅斿紑锛屽涓富棰樺強Qos鐢ㄥ垎鍙烽殧寮�锛屼緥濡傦細ym/topic1,1;ym/topic2,1;ym/topic3,1锛屽鏋滄湁澶氫釜OrgTag锛屼富棰樺墠缂�鐢ㄥ叾OrgTag + publishQos: 鍙戝竷娑堟伅鐨凲os锛屽彇鍊艰寖鍥达細 + 0 鑷冲涓�娆★紙At most once锛� 娑堟伅鍙戦�佸悗涓嶄繚璇佸埌杈撅紝鍙兘涓㈠け鎴栭噸澶嶏紝寮�閿�鏈�灏忥紝鍙潬鎬ф渶浣庛�� + 1 鑷冲皯涓�娆★紙At least once锛� 娑堟伅鑷冲皯浼氬埌杈句竴娆★紝鍙兘閲嶅锛屼絾涓嶄細涓㈠け锛屽彲闈犳�т腑绛夛紝閫傜敤浜庡鏁板満鏅�� + 2 鎭板ソ涓�娆★紙Exactly once锛� 娑堟伅浠呬細鍒拌揪涓�娆★紝涓嶉噸澶嶄笖涓嶄涪澶憋紝鍙潬鎬ф渶楂橈紝浣嗗紑閿�鏈�澶э紝瀹炵幇鏈�澶嶆潅銆� + --> + <mqtt enable="${mqtt.enable}" + svIp="121.199.41.121" + svPort="1883" + svUserName="dyyjy" + svUserPassword="Dyyjy2025,;.abc!@#" + poolMaxSize="10" + topicAndQos="${mqtt.topicAndQos}" + publishQos="1" + /> + </config> \ No newline at end of file -- Gitblit v1.8.0