From d351c59b38f772fb4fcfcb1a16b3fe40098da4f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 14 八月 2022 01:50:32 +0800
Subject: [PATCH] update 优化 缓存列表管理 适配 spring-cache 缓存的数据
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 49 ++-----------------------------------------------
1 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index ff9275a..b7caaea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -35,7 +34,6 @@
/**
* 瑙掕壊ID
*/
- @ApiModelProperty(value = "瑙掕壊ID")
@ExcelProperty(value = "瑙掕壊搴忓彿")
@TableId(value = "role_id")
private Long roleId;
@@ -43,7 +41,6 @@
/**
* 瑙掕壊鍚嶇О
*/
- @ApiModelProperty(value = "瑙掕壊鍚嶇О")
@ExcelProperty(value = "瑙掕壊鍚嶇О")
@NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
@@ -52,7 +49,6 @@
/**
* 瑙掕壊鏉冮檺
*/
- @ApiModelProperty(value = "瑙掕壊鏉冮檺")
@ExcelProperty(value = "瑙掕壊鏉冮檺")
@NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -61,7 +57,6 @@
/**
* 瑙掕壊鎺掑簭
*/
- @ApiModelProperty(value = "瑙掕壊鎺掑簭")
@ExcelProperty(value = "瑙掕壊鎺掑簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer roleSort;
@@ -69,7 +64,6 @@
/**
* 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�
*/
- @ApiModelProperty(value = "鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�")
@ExcelProperty(value = "鏁版嵁鑼冨洿", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=鎵�鏈夋暟鎹潈闄�,2=鑷畾涔夋暟鎹潈闄�,3=鏈儴闂ㄦ暟鎹潈闄�,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄�")
private String dataScope;
@@ -77,19 +71,16 @@
/**
* 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級
*/
- @ApiModelProperty(value = "鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級")
- private Integer menuCheckStrictly;
+ private Boolean menuCheckStrictly;
/**
* 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�
*/
- @ApiModelProperty(value = "閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�")
- private Integer deptCheckStrictly;
+ private Boolean deptCheckStrictly;
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ApiModelProperty(value = "瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -97,34 +88,29 @@
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
- @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�
*/
- @ApiModelProperty(value = "鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�")
@TableField(exist = false)
private boolean flag = false;
/**
* 鑿滃崟缁�
*/
- @ApiModelProperty(value = "鑿滃崟缁�")
@TableField(exist = false)
private Long[] menuIds;
/**
* 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛�
*/
- @ApiModelProperty(value = "閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛�")
@TableField(exist = false)
private Long[] deptIds;
@@ -132,38 +118,7 @@
this.roleId = roleId;
}
- @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.roleId);
- }
-
- public Boolean getMenuCheckStrictly() {
- if (menuCheckStrictly == null) {
- return null;
- }
- return menuCheckStrictly == 1;
- }
-
- public void setMenuCheckStrictly(Boolean menuCheckStrictly) {
- if (menuCheckStrictly == null) {
- this.menuCheckStrictly = null;
- return;
- }
- this.menuCheckStrictly = menuCheckStrictly ? 1 : 0;
- }
-
- public Boolean getDeptCheckStrictly() {
- if (deptCheckStrictly == null) {
- return null;
- }
- return deptCheckStrictly == 1;
- }
-
- public void setDeptCheckStrictly(Boolean deptCheckStrictly) {
- if (deptCheckStrictly == null) {
- this.deptCheckStrictly = null;
- return;
- }
- this.deptCheckStrictly = deptCheckStrictly ? 1 : 0;
}
}
--
Gitblit v1.9.3