From 5b558e2637d4f8325e70fa7b19335dfc72e257fb Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 14:01:57 +0800
Subject: [PATCH] 实现强制结束当前升级任务功能

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/com/CommandCtrl.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/com/CommandCtrl.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/com/CommandCtrl.java
index 142a879..675f636 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/com/CommandCtrl.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/com/CommandCtrl.java
@@ -162,14 +162,14 @@
     }
 
     /**
-     * 鎺ユ敹web绯荤粺鍙戞潵鍋滄鍗囩骇浠诲姟
+     * 鎺ユ敹web绯荤粺鍙戞潵寮哄埗缁撴潫鍗囩骇浠诲姟
      * @return
      */
-    @PostMapping(path = "ugForceStop", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public BaseResponse<String> ugForceStop() {
+    @PostMapping(path = "ugForceOver", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public BaseResponse<String> ugForceOver() {
         log.info("鏀跺埌鍋滄RTU鍗囩骇浠诲姟鍛戒护") ;
         try{
-            String mes = UpgradeUnit.getInstance().overUpgradeTask();
+            String mes = UpgradeUnit.getInstance().forceOverUpgradeTask();
             if(mes == null){
                 mes = "鍋滄鍗囩骇浠诲姟鎴愬姛" ;
             }
@@ -179,7 +179,6 @@
             return BaseResponseUtils.buildError("鍋滄RTU鍗囩骇浠诲姟鏃跺彂鐢熷紓甯�" + (e.getMessage() == null?"":("锛�" + e.getMessage())));
         }
     }
-
 
     /**
      * 鎺ユ敹web绯荤粺鍙戞潵鐨勫懡浠�

--
Gitblit v1.8.0