From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 27 六月 2025 11:33:35 +0800 Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码； 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题（王江海测试发现）。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java index e225ebd..ed9df08 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java @@ -21,12 +21,14 @@ //閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧 public static Long commandSendInterval = 5 * 1000L ; - + //閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠ょ殑鏃堕棿闂撮殧 + public static Long fastCommandSendInterval = 1000L ; + //鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀� - public static Long cachWaitResultTimeout = 15 * 1000L ; + public static Long cacheWaitResultTimeout = 15 * 1000L ; //涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀� - public static Long offLineCachTimeout = 60 * 1000L ; + public static Long offLineCacheTimeout = 60 * 1000L ; //TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婃暟鎹悓鏃朵笅鍙戞暟鎹紝鍥犱负RTU澶勭悊涓嶈繃鏉� public static Long lastUpDataTimeLive = 1000L ; @@ -43,4 +45,19 @@ //娌℃湁涓婅鏁版嵁鐨勫垎閽熸暟锛岃揪鍒拌繖涓垎閽熸暟锛岃涓篟TU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2000_100000 public static Long disconnectedByNoUpDataMinutes = 3000L ; + //宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆� + public static Integer workReportDealOneByTimes = 5 ; + + //瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級 + public static Double intakeAlarmLossMinValue = 1.0 ; + + //鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級 + public static Integer sendDingDingAlarmMsInterval = 60 ; + + //Mqtt妯″潡鏄惁鍚姩 + public static Boolean mqttUnitEnable = false ; + public static Long mqttAcceptDataMinInterval = 60 * 60 * 1000L ;//榛樿60鍒嗛挓 + + + } -- Gitblit v1.8.0