From 959dcca95276888cd9c092d93d276ef9aa580aef Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 30 四月 2025 16:26:19 +0800 Subject: [PATCH] 1、增加远程透传命令; 2、表阀一体机协议优化; --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java index 39943c2..9caed79 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java @@ -69,7 +69,7 @@ this.task.forceOver(); } this.task = new UpgradeTask(); - this.task.initOption(this.lastOpenMaxGoOn, this.failTryTimes, this.ugMaxRtuSameTime); + this.task.initOption(this.openNoUpgrade, this.lastOpenMaxGoOn, this.failTryTimes, this.ugMaxRtuSameTime); this.task.setTask(vo); this.nowNotifyTimesAfterOver = 0 ; this.monitorFirst = true ; @@ -120,9 +120,9 @@ * @param protocolVersion 涓婅鏁版嵁瀵瑰簲鐨勫崗璁増鏈彿 * @param callbackCom 鍥炶皟鍑芥暟锛屽鐞嗕笅琛屽懡浠� */ - public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callbackCom){ + public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callbackCom, Object ...objects){ if(task != null && !task.taskIsOver){ - this.task.trigger(rtuAddr, code, protocolName, protocolVersion, callbackCom); + this.task.trigger(rtuAddr, code, protocolName, protocolVersion, callbackCom, objects); } } -- Gitblit v1.8.0