From a6fb88d74c20cc28043d75e8a5097fce49cf9a78 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 15:19:42 +0800
Subject: [PATCH] update [重大更新]全业务 增加 接口文档注解 格式化代码
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 64 ++++++++++++-------------------
1 files changed, 25 insertions(+), 39 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 5163524..1d186db 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
@@ -2,44 +2,48 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
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;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 瑙掕壊琛� sys_role
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_role")
@ExcelIgnoreUnannotated
-public class SysRole implements Serializable {
- private static final long serialVersionUID = 1L;
+public class SysRole extends BaseEntity {
/**
* 瑙掕壊ID
*/
+ @ApiModelProperty(value = "瑙掕壊ID")
@ExcelProperty(value = "瑙掕壊搴忓彿")
- @TableId(value = "role_id", type = IdType.AUTO)
+ @TableId(value = "role_id")
private Long roleId;
/**
* 瑙掕壊鍚嶇О
*/
+ @ApiModelProperty(value = "瑙掕壊鍚嶇О")
@ExcelProperty(value = "瑙掕壊鍚嶇О")
@NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
@@ -48,6 +52,7 @@
/**
* 瑙掕壊鏉冮檺
*/
+ @ApiModelProperty(value = "瑙掕壊鏉冮檺")
@ExcelProperty(value = "瑙掕壊鏉冮檺")
@NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -56,6 +61,7 @@
/**
* 瑙掕壊鎺掑簭
*/
+ @ApiModelProperty(value = "瑙掕壊鎺掑簭")
@ExcelProperty(value = "瑙掕壊鎺掑簭")
@NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private String roleSort;
@@ -63,6 +69,7 @@
/**
* 鏁版嵁鑼冨洿锛�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;
@@ -70,16 +77,19 @@
/**
* 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級
*/
+ @ApiModelProperty(value = "鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級")
private boolean menuCheckStrictly;
/**
* 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�
*/
+ @ApiModelProperty(value = "閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�")
private boolean deptCheckStrictly;
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
+ @ApiModelProperty(value = "瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -87,59 +97,34 @@
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
/**
* 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�
*/
+ @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;
@@ -147,6 +132,7 @@
this.roleId = roleId;
}
+ @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
return isAdmin(this.roleId);
}
--
Gitblit v1.9.3