From f2ff839106246d225d4ddc8dfa8881db1c597876 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 23 十二月 2022 13:29:40 +0800
Subject: [PATCH] update springboot 2.7.6 => 2.7.7 update easyexcel 3.1.3 => 3.1.4
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 192 +++++++++++++++++------------------------------
1 files changed, 71 insertions(+), 121 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index d2c5bbf..201605f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -1,154 +1,104 @@
package com.ruoyi.common.core.domain.entity;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.domain.TreeEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
/**
* 鑿滃崟鏉冮檺琛� sys_menu
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("sys_menu")
-public class SysMenu implements Serializable {
- private static final long serialVersionUID = 1L;
+public class SysMenu extends TreeEntity<SysMenu> {
- /**
- * 鑿滃崟ID
- */
- @TableId(value = "menu_id", type = IdType.AUTO)
- private Long menuId;
+ /**
+ * 鑿滃崟ID
+ */
+ @TableId(value = "menu_id")
+ private Long menuId;
- /**
- * 鑿滃崟鍚嶇О
- */
- @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String menuName;
+ /**
+ * 鑿滃崟鍚嶇О
+ */
+ @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String menuName;
- /**
- * 鐖惰彍鍗曞悕绉�
- */
- @TableField(exist = false)
- private String parentName;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer orderNum;
- /**
- * 鐖惰彍鍗旾D
- */
- private Long parentId;
+ /**
+ * 璺敱鍦板潃
+ */
+ @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
+ private String path;
- /**
- * 鏄剧ず椤哄簭
- */
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
-
- /**
- * 璺敱鍦板潃
- */
- @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
- private String path;
-
- /**
- * 缁勪欢璺緞
- */
- @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
- private String component;
+ /**
+ * 缁勪欢璺緞
+ */
+ @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
+ private String component;
/**
* 璺敱鍙傛暟
*/
- private String query;
+ private String queryParam;
- /**
- * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
- */
- private String isFrame;
+ /**
+ * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
+ */
+ private String isFrame;
- /**
- * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
- */
- private String isCache;
+ /**
+ * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
+ */
+ private String isCache;
- /**
- * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
- */
- @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
- private String menuType;
+ /**
+ * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
+ */
+ @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
+ private String menuType;
- /**
- * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
- */
- private String visible;
+ /**
+ * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ */
+ private String visible;
- /**
- * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
- */
- private String status;
+ /**
+ * 鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ private String status;
- /**
- * 鏉冮檺瀛楃涓�
- */
- @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String perms;
+ /**
+ * 鏉冮檺瀛楃涓�
+ */
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String perms;
- /**
- * 鑿滃崟鍥炬爣
- */
- private String icon;
+ /**
+ * 鑿滃崟鍥炬爣
+ */
+ private String icon;
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
- /**
- * 瀛愯彍鍗�
- */
- @TableField(exist = false)
- private List<SysMenu> children = new ArrayList<SysMenu>();
+ /**
+ * 澶囨敞
+ */
+ private String remark;
}
--
Gitblit v1.9.3