From 4aacf43565d374fff53115d3c1112c234f13e2f5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 07 六月 2022 14:16:34 +0800
Subject: [PATCH] 角色

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java |   33 +--------------------------------
 1 files changed, 1 insertions(+), 32 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 2b628fb..1a2e630 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -302,41 +302,10 @@
          * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
          */
 
-//        if (oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
-//            //鍏ㄩ儴鎴愬姛
-//            return 0;
-//        } else if (!closeLight.isEmpty() || !oldPoleFail.isEmpty()) {
-//            //鍏崇伅澶辫触  鎴栬�呰鐩栦换鍔″け璐�
-//            return 1;
-//        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closeSuccess.isEmpty()) {
-//            //缂栬緫鍏ㄩ儴澶辫触
-//            return 2;
-//        } else {
-//            //鍏朵粬鎯呭喌
-//            return -1;
-//        }
-
-//        if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
-//            //缂栬緫鎴愬姛
-//            return 0;
-//        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-//            //缂栬緫澶辫触
-//            return 1;
-//        } else {
-//            //鍦ㄦ棫浠诲姟鍩虹涓婄紪杈�
-//            if (lightTask.getTaskId().equals(newLightTask.getTaskId())) {
-//                //鍙湁鏃т换鍔�
-//                return 2;
-//            }  else {
-//                //鏈夋柊浠诲姟锛屾湁鏃т换鍔�
-//                return 3;
-//            }
-//        }
-
         if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
             return "缂栬緫鎴愬姛";
         } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-            throw new BusinessException("缂栬緫澶辫触");
+            throw new BusinessException("缂栬緫澶辫触,璇锋鏌ョ紪杈戠殑璁惧鏄惁鍦ㄧ嚎!");
         } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
             return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
         } else if (!newPoleFail.isEmpty()) {

--
Gitblit v1.9.3