From 4363c91872e6d83e139b22c95a0d7e83183d8f69 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 18 Apr 2024 19:48:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/model/req/MenuReq.java         |  1 +
 .../admin/system/model/resp/MenuResp.java       | 17 -----------------
 .../admin/webapi/system/MenuController.java     |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java
index 664dd46d..3c3e5e1a 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java
@@ -133,5 +133,6 @@ public class MenuReq extends BaseReq {
      * 状态
      */
     @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1")
+    @NotNull(message = "状态非法")
     private DisEnableStatusEnum status;
 }
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java
index 47d8675b..072b75be 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java
@@ -16,14 +16,11 @@
 
 package top.charles7c.continew.admin.system.model.resp;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum;
 import top.charles7c.continew.admin.common.enums.MenuTypeEnum;
 import top.continew.starter.extension.crud.annotation.TreeField;
-import top.continew.starter.extension.crud.converter.ExcelBaseEnumConverter;
 import top.continew.starter.extension.crud.model.resp.BaseResp;
 
 import java.io.Serial;
@@ -36,7 +33,6 @@ import java.io.Serial;
  */
 @Data
 @TreeField(value = "id")
-@ExcelIgnoreUnannotated
 @Schema(description = "菜单信息")
 public class MenuResp extends BaseResp {
 
@@ -47,7 +43,6 @@ public class MenuResp extends BaseResp {
      * 标题
      */
     @Schema(description = "标题", example = "用户管理")
-    @ExcelProperty(value = "标题")
     private String title;
 
     /**
@@ -60,83 +55,71 @@ public class MenuResp extends BaseResp {
      * 类型
      */
     @Schema(description = "类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2")
-    @ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class)
     private MenuTypeEnum type;
 
     /**
      * 路由地址
      */
     @Schema(description = "路由地址", example = "/system/user")
-    @ExcelProperty(value = "路由地址")
     private String path;
 
     /**
      * 组件名称
      */
     @Schema(description = "组件名称", example = "User")
-    @ExcelProperty(value = "组件名称")
     private String name;
 
     /**
      * 组件路径
      */
     @Schema(description = "组件路径", example = "/system/user/index")
-    @ExcelProperty(value = "组件路径")
     private String component;
 
     /**
      * 重定向地址
      */
     @Schema(description = "重定向地址")
-    @ExcelProperty(value = "重定向地址")
     private String redirect;
 
     /**
      * 图标
      */
     @Schema(description = "图标", example = "user")
-    @ExcelProperty(value = "图标")
     private String icon;
 
     /**
      * 是否外链
      */
     @Schema(description = "是否外链", example = "false")
-    @ExcelProperty(value = "是否外链")
     private Boolean isExternal;
 
     /**
      * 是否缓存
      */
     @Schema(description = "是否缓存", example = "false")
-    @ExcelProperty(value = "是否缓存")
     private Boolean isCache;
 
     /**
      * 是否隐藏
      */
     @Schema(description = "是否隐藏", example = "false")
-    @ExcelProperty(value = "是否隐藏")
     private Boolean isHidden;
 
     /**
      * 权限标识
      */
     @Schema(description = "权限标识", example = "system:user:list")
-    @ExcelProperty(value = "权限标识")
     private String permission;
 
     /**
      * 排序
      */
     @Schema(description = "排序", example = "1")
-    @ExcelProperty(value = "排序")
     private Integer sort;
 
     /**
      * 状态
      */
     @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1")
-    @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class)
     private DisEnableStatusEnum status;
 }
diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java
index e776f8b4..3fc02ef4 100644
--- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java
@@ -43,7 +43,7 @@ import top.continew.starter.web.model.R;
  */
 @Tag(name = "菜单管理 API")
 @RestController
-@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT})
+@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE})
 public class MenuController extends BaseController<MenuService, MenuResp, MenuResp, MenuQuery, MenuReq> {
 
     @Override