From a2d5f396dcee51917d333e42a977a544091e5389 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 10 二月 2025 14:02:57 +0800
Subject: [PATCH] 大屏展示--昨日农户用水前5名统计,昨日取水口用水统计前5名统计实现

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
index e923f27..9a7fd69 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
@@ -56,7 +56,7 @@
 
     @Override
     public void stop(UnitCallbackInterface callback) throws Exception {
-        overUpgradeTask() ;
+        forceOverUpgradeTask() ;
     }
 
 
@@ -73,12 +73,15 @@
     }
 
     /**
-     * 鍋滄褰撳墠鍗囩骇浠诲姟
+     * 缁撴潫褰撳墠鍗囩骇浠诲姟
      * @throws Exception
+     * @return null锛氱粨鏉熶换鍔℃垚鍔燂紝鍚﹀垯杩斿洖澶辫触鍘熷洜
      */
-    public void overUpgradeTask() throws Exception {
+    public String forceOverUpgradeTask() throws Exception {
         if(manager != null ){
-            manager.overUpgradeTask() ;
+            return manager.forceOverUpgradeTask() ;
+        }else{
+            return "閫氫俊涓棿浠跺唴閮ㄩ敊璇�" ;
         }
     }
 
@@ -88,9 +91,9 @@
      * @param code
      * @param callback
      */
-    public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback){
+    public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback, Object ...objects){
         if(manager != null ){
-            manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback);
+            manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback, objects);
         }
     }
 

--
Gitblit v1.8.0