From 357c496aadd1b6c620a91a4359fc85c63b5b2011 Mon Sep 17 00:00:00 2001
From: shirenchuang <shi806638253>
Date: Mon, 19 Apr 2021 10:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E5=BA=94=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=20=E5=88=A4=E6=96=AD=E5=85=88=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BFtopic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaojukeji/kafka/manager/common/entity/ResultStatus.java   | 3 +++
 .../kafka/manager/bpm/order/impl/DeleteAppOrder.java           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
index 454a687f..0f8aebd6 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
@@ -25,6 +25,9 @@ public enum ResultStatus {
     CHANGE_ZOOKEEPER_FORBIDDEN(1405, "change zookeeper forbidden"),
 
 
+    APP_OFFLINE_FORBIDDEN(1406, "先下线topic，才能下线应用～"),
+
+
     TOPIC_OPERATION_PARAM_NULL_POINTER(1450, "参数错误"),
     TOPIC_OPERATION_PARTITION_NUM_ILLEGAL(1451, "分区数错误"),
     TOPIC_OPERATION_BROKER_NUM_NOT_ENOUGH(1452, "Broker数不足错误"),
diff --git a/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/order/impl/DeleteAppOrder.java b/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/order/impl/DeleteAppOrder.java
index 44aa9a0e..6127abc2 100644
--- a/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/order/impl/DeleteAppOrder.java
+++ b/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/order/impl/DeleteAppOrder.java
@@ -95,7 +95,7 @@ public class DeleteAppOrder extends AbstractAppOrder {
         // 判断app是否对topic有权限
         List<AuthorityDO> authorityList = authorityService.getAuthority(orderAppExtension.getAppId());
         if (!ValidateUtils.isEmptyList(authorityList)) {
-            return ResultStatus.OPERATION_FORBIDDEN;
+            return ResultStatus.APP_OFFLINE_FORBIDDEN;
         }
         if (appService.deleteApp(appDO, userName) > 0) {
             return ResultStatus.SUCCESS;
-- 
GitLab