sync -- 同步 RuoYi-Vue-Plus（v4.3.0） 更新

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java

@@ -0,0 +1,47 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.utils.StringUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 缓存信息
+ *
+ * @author Lion Li
+ */
+@Data
+@NoArgsConstructor
+public class SysCache {
+
+    /**
+     * 缓存名称
+     */
+    private String cacheName = "";
+
+    /**
+     * 缓存键名
+     */
+    private String cacheKey = "";
+
+    /**
+     * 缓存内容
+     */
+    private String cacheValue = "";
+
+    /**
+     * 备注
+     */
+    private String remark = "";
+
+    public SysCache(String cacheName, String remark) {
+        this.cacheName = cacheName;
+        this.remark = remark;
+    }
+
+    public SysCache(String cacheName, String cacheKey, String cacheValue) {
+        this.cacheName = StringUtils.replace(cacheName, ":", "");
+        this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
+        this.cacheValue = cacheValue;
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -7,8 +7,6 @@ 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.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -25,13 +23,11 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_config")
 @ExcelIgnoreUnannotated
-@ApiModel("参数配置业务对象")
 public class SysConfig extends BaseEntity {
 
     /**
      * 参数主键
      */
-    @ApiModelProperty(value = "参数主键")
     @ExcelProperty(value = "参数主键")
     @TableId(value = "config_id")
     private Long configId;
@@ -39,7 +35,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数名称
      */
-    @ApiModelProperty(value = "参数名称")
     @ExcelProperty(value = "参数名称")
     @NotBlank(message = "参数名称不能为空")
     @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
@@ -48,7 +43,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数键名
      */
-    @ApiModelProperty(value = "参数键名")
     @ExcelProperty(value = "参数键名")
     @NotBlank(message = "参数键名长度不能为空")
     @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
@@ -57,7 +51,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数键值
      */
-    @ApiModelProperty(value = "参数键值")
     @ExcelProperty(value = "参数键值")
     @NotBlank(message = "参数键值不能为空")
     @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
@@ -66,7 +59,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 系统内置（Y是 N否）
      */
-    @ApiModelProperty(value = "系统内置（Y是 N否）")
     @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_yes_no")
     private String configType;
@@ -74,7 +66,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,14 +23,12 @@ import java.util.Map;
 @Data
 @TableName("sys_logininfor")
 @ExcelIgnoreUnannotated
-@ApiModel("系统访问记录业务对象")
 public class SysLogininfor implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * ID
      */
-    @ApiModelProperty(value = "访问ID")
     @ExcelProperty(value = "序号")
     @TableId(value = "info_id")
     private Long infoId;
@@ -40,14 +36,12 @@ public class SysLogininfor implements Serializable {
     /**
      * 用户账号
      */
-    @ApiModelProperty(value = "用户账号")
     @ExcelProperty(value = "用户账号")
     private String userName;
 
     /**
      * 登录状态 0成功 1失败
      */
-    @ApiModelProperty(value = "登录状态 0成功 1失败")
     @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
@@ -55,49 +49,42 @@ public class SysLogininfor implements Serializable {
     /**
      * 登录IP地址
      */
-    @ApiModelProperty(value = "登录IP地址")
     @ExcelProperty(value = "登录地址")
     private String ipaddr;
 
     /**
      * 登录地点
      */
-    @ApiModelProperty(value = "登录地点")
     @ExcelProperty(value = "登录地点")
     private String loginLocation;
 
     /**
      * 浏览器类型
      */
-    @ApiModelProperty(value = "浏览器类型")
     @ExcelProperty(value = "浏览器")
     private String browser;
 
     /**
      * 操作系统
      */
-    @ApiModelProperty(value = "操作系统")
     @ExcelProperty(value = "操作系统")
     private String os;
 
     /**
      * 提示消息
      */
-    @ApiModelProperty(value = "提示消息")
     @ExcelProperty(value = "提示消息")
     private String msg;
 
     /**
      * 访问时间
      */
-    @ApiModelProperty(value = "访问时间")
     @ExcelProperty(value = "访问时间")
     private Date loginTime;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -25,7 +24,6 @@ public class SysNotice extends BaseEntity {
     /**
      * 公告ID
      */
-    @ApiModelProperty(value = "公告ID")
     @TableId(value = "notice_id")
     private Long noticeId;
 
@@ -33,7 +31,6 @@ public class SysNotice extends BaseEntity {
      * 公告标题
      */
     @Xss(message = "公告标题不能包含脚本字符")
-    @ApiModelProperty(value = "公告标题")
     @NotBlank(message = "公告标题不能为空")
     @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
     private String noticeTitle;
@@ -41,25 +38,21 @@ public class SysNotice extends BaseEntity {
     /**
      * 公告类型（1通知 2公告）
      */
-    @ApiModelProperty(value = "公告类型（1通知 2公告）")
     private String noticeType;
 
     /**
      * 公告内容
      */
-    @ApiModelProperty(value = "公告内容")
     private String noticeContent;
 
     /**
      * 公告状态（0正常 1关闭）
      */
-    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
     private String status;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,7 +23,6 @@ import java.util.Map;
 @Data
 @TableName("sys_oper_log")
 @ExcelIgnoreUnannotated
-@ApiModel("操作日志记录业务对象")
 public class SysOperLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,7 +30,6 @@ public class SysOperLog implements Serializable {
     /**
      * 日志主键
      */
-    @ApiModelProperty(value = "日志主键")
     @ExcelProperty(value = "日志主键")
     @TableId(value = "oper_id")
     private Long operId;
@@ -41,14 +37,12 @@ public class SysOperLog implements Serializable {
     /**
      * 操作模块
      */
-    @ApiModelProperty(value = "操作模块")
     @ExcelProperty(value = "操作模块")
     private String title;
 
     /**
      * 业务类型（0其它 1新增 2修改 3删除）
      */
-    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
     @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_oper_type")
     private Integer businessType;
@@ -56,28 +50,24 @@ public class SysOperLog implements Serializable {
     /**
      * 业务类型数组
      */
-    @ApiModelProperty(value = "业务类型数组")
     @TableField(exist = false)
     private Integer[] businessTypes;
 
     /**
      * 请求方法
      */
-    @ApiModelProperty(value = "请求方法")
     @ExcelProperty(value = "请求方法")
     private String method;
 
     /**
      * 请求方式
      */
-    @ApiModelProperty(value = "请求方式")
     @ExcelProperty(value = "请求方式")
     private String requestMethod;
 
     /**
      * 操作类别（0其它 1后台用户 2手机端用户）
      */
-    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
     @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
     private Integer operatorType;
@@ -85,56 +75,48 @@ public class SysOperLog implements Serializable {
     /**
      * 操作人员
      */
-    @ApiModelProperty(value = "操作人员")
     @ExcelProperty(value = "操作人员")
     private String operName;
 
     /**
      * 部门名称
      */
-    @ApiModelProperty(value = "部门名称")
     @ExcelProperty(value = "部门名称")
     private String deptName;
 
     /**
      * 请求url
      */
-    @ApiModelProperty(value = "请求url")
     @ExcelProperty(value = "请求地址")
     private String operUrl;
 
     /**
      * 操作地址
      */
-    @ApiModelProperty(value = "操作地址")
     @ExcelProperty(value = "操作地址")
     private String operIp;
 
     /**
      * 操作地点
      */
-    @ApiModelProperty(value = "操作地点")
     @ExcelProperty(value = "操作地点")
     private String operLocation;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @ExcelProperty(value = "请求参数")
     private String operParam;
 
     /**
      * 返回参数
      */
-    @ApiModelProperty(value = "返回参数")
     @ExcelProperty(value = "返回参数")
     private String jsonResult;
 
     /**
      * 操作状态（0正常 1异常）
      */
-    @ApiModelProperty(value = "操作状态（0正常 1异常）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private Integer status;
@@ -142,21 +124,18 @@ public class SysOperLog implements Serializable {
     /**
      * 错误消息
      */
-    @ApiModelProperty(value = "错误消息")
     @ExcelProperty(value = "错误消息")
     private String errorMsg;
 
     /**
      * 操作时间
      */
-    @ApiModelProperty(value = "操作时间")
     @ExcelProperty(value = "操作时间")
     private Date operTime;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -8,8 +8,6 @@ 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.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -27,13 +25,11 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_post")
 @ExcelIgnoreUnannotated
-@ApiModel("岗位信息业务对象")
 public class SysPost extends BaseEntity {
 
     /**
      * 岗位序号
      */
-    @ApiModelProperty(value = "岗位序号")
     @ExcelProperty(value = "岗位序号")
     @TableId(value = "post_id")
     private Long postId;
@@ -41,7 +37,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位编码
      */
-    @ApiModelProperty(value = "岗位编码")
     @ExcelProperty(value = "岗位编码")
     @NotBlank(message = "岗位编码不能为空")
     @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
@@ -50,7 +45,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位名称
      */
-    @ApiModelProperty(value = "岗位名称")
     @ExcelProperty(value = "岗位名称")
     @NotBlank(message = "岗位名称不能为空")
     @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
@@ -59,7 +53,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位排序
      */
-    @ApiModelProperty(value = "岗位排序")
     @ExcelProperty(value = "岗位排序")
     @NotNull(message = "显示顺序不能为空")
     private Integer postSort;
@@ -67,21 +60,18 @@ public class SysPost extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
+    @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 用户是否存在此岗位标识 默认不存在
      */
-    @ApiModelProperty(value = "用户是否存在此岗位标识 默认不存在")
     @TableField(exist = false)
     private boolean flag = false;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,20 +13,17 @@ import lombok.Data;
 
 @Data
 @TableName("sys_role_dept")
-@ApiModel("角色和部门关联")
 public class SysRoleDept {
 
     /**
      * 角色ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /**
      * 部门ID
      */
-    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,20 +13,17 @@ import lombok.Data;
 
 @Data
 @TableName("sys_role_menu")
-@ApiModel("角色和菜单关联")
 public class SysRoleMenu {
 
     /**
      * 角色ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /**
      * 菜单ID
      */
-    @ApiModelProperty(value = "角色ID")
     private Long menuId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java

@@ -1,7 +1,5 @@
 package com.ruoyi.system.domain;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,55 +9,46 @@ import lombok.Data;
  */
 
 @Data
-@ApiModel("当前在线会话业务对象")
 public class SysUserOnline {
 
     /**
      * 会话编号
      */
-    @ApiModelProperty(value = "会话编号")
     private String tokenId;
 
     /**
      * 部门名称
      */
-    @ApiModelProperty(value = "部门名称")
     private String deptName;
 
     /**
      * 用户名称
      */
-    @ApiModelProperty(value = "用户名称")
     private String userName;
 
     /**
      * 登录IP地址
      */
-    @ApiModelProperty(value = "登录IP地址")
     private String ipaddr;
 
     /**
      * 登录地址
      */
-    @ApiModelProperty(value = "登录地址")
     private String loginLocation;
 
     /**
      * 浏览器类型
      */
-    @ApiModelProperty(value = "浏览器类型")
     private String browser;
 
     /**
      * 操作系统
      */
-    @ApiModelProperty(value = "操作系统")
     private String os;
 
     /**
      * 登录时间
      */
-    @ApiModelProperty(value = "登录时间")
     private Long loginTime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,20 +13,17 @@ import lombok.Data;
 
 @Data
 @TableName("sys_user_post")
-@ApiModel("用户和岗位关联")
 public class SysUserPost {
 
     /**
      * 用户ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 岗位ID
      */
-    @ApiModelProperty(value = "岗位ID")
     private Long postId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,20 +13,17 @@ import lombok.Data;
 
 @Data
 @TableName("sys_user_role")
-@ApiModel("用户和角色关联")
 public class SysUserRole {
 
     /**
      * 用户ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 角色ID
      */
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.domain.bo;
 
 import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,33 +11,27 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("OSS对象存储分页查询对象")
 public class SysOssBo extends BaseEntity {
 
     /**
      * 文件名
      */
-    @ApiModelProperty("文件名")
     private String fileName;
     /**
      * 原名
      */
-    @ApiModelProperty("原名")
     private String originalName;
     /**
      * 文件后缀名
      */
-    @ApiModelProperty("文件后缀名")
     private String fileSuffix;
     /**
      * URL地址
      */
-    @ApiModelProperty("URL地址")
     private String url;
     /**
      * 服务商
      */
-    @ApiModelProperty("服务商")
     private String service;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,20 +20,17 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("对象存储配置业务对象")
 public class SysOssConfigBo extends BaseEntity {
 
     /**
      * 主建
      */
-    @ApiModelProperty(value = "主建", required = true)
     @NotNull(message = "主建不能为空", groups = {EditGroup.class})
     private Long ossConfigId;
 
     /**
      * 配置key
      */
-    @ApiModelProperty(value = "配置key", required = true)
     @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间")
     private String configKey;
@@ -43,7 +38,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * accessKey
      */
-    @ApiModelProperty(value = "accessKey", required = true)
     @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
     private String accessKey;
@@ -51,7 +45,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 秘钥
      */
-    @ApiModelProperty(value = "secretKey", required = true)
     @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
     private String secretKey;
@@ -59,7 +52,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 桶名称
      */
-    @ApiModelProperty(value = "桶名称", required = true)
     @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
     private String bucketName;
@@ -67,13 +59,11 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 前缀
      */
-    @ApiModelProperty(value = "前缀")
     private String prefix;
 
     /**
      * 访问站点
      */
-    @ApiModelProperty(value = "访问站点", required = true)
     @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
     private String endpoint;
@@ -81,37 +71,31 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 自定义域名
      */
-    @ApiModelProperty("自定义域名")
     private String domain;
 
     /**
      * 是否https（Y=是,N=否）
      */
-    @ApiModelProperty("是否https（Y=是,N=否）")
     private String isHttps;
 
     /**
      * 状态（0=正常,1=停用）
      */
-    @ApiModelProperty("状态（0=正常,1=停用）")
     private String status;
 
     /**
      * 域
      */
-    @ApiModelProperty(value = "域")
     private String region;
 
     /**
      * 扩展字段
      */
-    @ApiModelProperty(value = "扩展字段")
     private String ext1;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
 import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,31 +10,26 @@ import lombok.Data;
  */
 
 @Data
-@ApiModel("路由显示信息")
 public class MetaVo {
 
     /**
      * 设置该路由在侧边栏和面包屑中展示的名字
      */
-    @ApiModelProperty(value = "设置该路由在侧边栏和面包屑中展示的名字")
     private String title;
 
     /**
      * 设置该路由的图标，对应路径src/assets/icons/svg
      */
-    @ApiModelProperty(value = "设置该路由的图标，对应路径src/assets/icons/svg")
     private String icon;
 
     /**
      * 设置为true，则不会被 <keep-alive>缓存
      */
-    @ApiModelProperty(value = "设置为true，则不会被 <keep-alive>缓存")
     private boolean noCache;
 
     /**
      * 内链地址（http(s)://开头）
      */
-    @ApiModelProperty(value = "内链地址（http(s)://开头）")
     private String link;
 
     public MetaVo(String title, String icon) {

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -14,61 +12,51 @@ import java.util.List;
  */
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-@ApiModel("路由配置信息")
 public class RouterVo {
 
     /**
      * 路由名字
      */
-    @ApiModelProperty(value = "路由名字")
     private String name;
 
     /**
      * 路由地址
      */
-    @ApiModelProperty(value = "路由地址")
     private String path;
 
     /**
      * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
      */
-    @ApiModelProperty(value = "是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现")
     private boolean hidden;
 
     /**
      * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
      */
-    @ApiModelProperty(value = "重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击")
     private String redirect;
 
     /**
      * 组件地址
      */
-    @ApiModelProperty(value = "组件地址")
     private String component;
 
     /**
      * 路由参数：如 {"id": 1, "name": "ry"}
      */
-    @ApiModelProperty(value = "路由参数：如 {\"id\": 1, \"name\": \"ry\"}")
     private String query;
 
     /**
      * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
      */
-    @ApiModelProperty(value = "当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面")
     private Boolean alwaysShow;
 
     /**
      * 其他元素
      */
-    @ApiModelProperty(value = "其他元素")
     private MetaVo meta;
 
     /**
      * 子路由
      */
-    @ApiModelProperty(value = "子路由")
     private List<RouterVo> children;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -14,7 +12,6 @@ import lombok.Data;
  * @date 2021-08-13
  */
 @Data
-@ApiModel("对象存储配置视图对象")
 @ExcelIgnoreUnannotated
 public class SysOssConfigVo {
 
@@ -23,79 +20,66 @@ public class SysOssConfigVo {
     /**
      * 主建
      */
-    @ApiModelProperty("主建")
     private Long ossConfigId;
 
     /**
      * 配置key
      */
-    @ApiModelProperty("配置key")
     private String configKey;
 
     /**
      * accessKey
      */
-    @ApiModelProperty("accessKey")
     private String accessKey;
 
     /**
      * 秘钥
      */
-    @ApiModelProperty("secretKey")
     private String secretKey;
 
     /**
      * 桶名称
      */
-    @ApiModelProperty("桶名称")
     private String bucketName;
 
     /**
      * 前缀
      */
-    @ApiModelProperty("前缀")
     private String prefix;
 
     /**
      * 访问站点
      */
-    @ApiModelProperty("访问站点")
     private String endpoint;
 
     /**
      * 自定义域名
      */
-    @ApiModelProperty("自定义域名")
     private String domain;
 
     /**
      * 是否https（Y=是,N=否）
      */
-    @ApiModelProperty("是否https（Y=是,N=否）")
     private String isHttps;
 
     /**
      * 域
      */
-    @ApiModelProperty("域")
     private String region;
 
     /**
      * 状态（0=正常,1=停用）
      */
-    @ApiModelProperty("状态（0=正常,1=停用）")
     private String status;
 
     /**
      * 扩展字段
      */
-    @ApiModelProperty("扩展字段")
     private String ext1;
 
     /**
      * 备注
      */
-    @ApiModelProperty("备注")
     private String remark;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.system.domain.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,7 +10,6 @@ import java.util.Date;
  * @author Lion Li
  */
 @Data
-@ApiModel("OSS对象存储视图对象")
 public class SysOssVo {
 
     private static final long serialVersionUID = 1L;
@@ -20,49 +17,41 @@ public class SysOssVo {
     /**
      * 对象存储主键
      */
-    @ApiModelProperty("对象存储主键")
     private Long ossId;
 
     /**
      * 文件名
      */
-    @ApiModelProperty("文件名")
     private String fileName;
 
     /**
      * 原名
      */
-    @ApiModelProperty("原名")
     private String originalName;
 
     /**
      * 文件后缀名
      */
-    @ApiModelProperty("文件后缀名")
     private String fileSuffix;
 
     /**
      * URL地址
      */
-    @ApiModelProperty("URL地址")
     private String url;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty("创建时间")
     private Date createTime;
 
     /**
      * 上传人
      */
-    @ApiModelProperty("上传人")
     private String createBy;
 
     /**
      * 服务商
      */
-    @ApiModelProperty("服务商")
     private String service;
 
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java

@@ -61,7 +61,7 @@ public class SysUserExportVo implements Serializable {
      * 帐号状态（0正常 1停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
+    @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java

@@ -62,6 +62,9 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
                 successNum++;
                 successMsg.append("<br/>").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功");
             } else if (isUpdateSupport) {
+                Long userId = user.getUserId();
+                user = BeanUtil.toBean(userVo, SysUser.class);
+                user.setUserId(userId);
                 ValidatorUtils.validate(user);
                 user.setUpdateBy(operName);
                 userService.updateUser(user);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -40,6 +40,14 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, Sy
      */
     List<String> selectMenuPermsByUserId(Long userId);
 
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    List<String> selectMenuPermsByRoleId(Long roleId);
+
     /**
      * 根据用户ID查询菜单
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -37,7 +37,7 @@ public interface ISysConfigService {
      *
      * @return true开启，false关闭
      */
-    boolean selectCaptchaOnOff();
+    boolean selectCaptchaEnabled();
 
     /**
      * 查询参数配置列表
@@ -53,7 +53,7 @@ public interface ISysConfigService {
      * @param config 参数配置信息
      * @return 结果
      */
-    int insertConfig(SysConfig config);
+    String insertConfig(SysConfig config);
 
     /**
      * 修改参数配置
@@ -61,7 +61,7 @@ public interface ISysConfigService {
      * @param config 参数配置信息
      * @return 结果
      */
-    int updateConfig(SysConfig config);
+    String updateConfig(SysConfig config);
 
     /**
      * 批量删除参数信息
@@ -93,6 +93,4 @@ public interface ISysConfigService {
      */
     String checkConfigKeyUnique(SysConfig config);
 
-    SysConfig getOne(SysConfig config);
-
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -19,6 +19,14 @@ public interface ISysDeptService {
      */
     List<SysDept> selectDeptList(SysDept dept);
 
+    /**
+     * 查询部门树结构信息
+     *
+     * @param dept 部门信息
+     * @return 部门树信息集合
+     */
+    List<Tree<Long>> selectDeptTreeList(SysDept dept);
+
     /**
      * 构建前端所需要下拉树结构
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -54,7 +54,7 @@ public interface ISysDictDataService {
      * @param dictData 字典数据信息
      * @return 结果
      */
-    int insertDictData(SysDictData dictData);
+    List<SysDictData> insertDictData(SysDictData dictData);
 
     /**
      * 修改保存字典数据信息
@@ -62,5 +62,5 @@ public interface ISysDictDataService {
      * @param dictData 字典数据信息
      * @return 结果
      */
-    int updateDictData(SysDictData dictData);
+    List<SysDictData> updateDictData(SysDictData dictData);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -84,7 +84,7 @@ public interface ISysDictTypeService {
      * @param dictType 字典类型信息
      * @return 结果
      */
-    int insertDictType(SysDictType dictType);
+    List<SysDictData> insertDictType(SysDictType dictType);
 
     /**
      * 修改保存字典类型信息
@@ -92,7 +92,7 @@ public interface ISysDictTypeService {
      * @param dictType 字典类型信息
      * @return 结果
      */
-    int updateDictType(SysDictType dictType);
+    List<SysDictData> updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -39,6 +39,14 @@ public interface ISysMenuService {
      */
     Set<String> selectMenuPermsByUserId(Long userId);
 
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    Set<String> selectMenuPermsByRoleId(Long roleId);
+
     /**
      * 根据用户ID查询菜单树信息
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java

@@ -21,7 +21,7 @@ public interface ISysOssService {
 
     List<SysOssVo> listByIds(Collection<Long> ossIds);
 
-    SysOss getById(Long ossId);
+    SysOssVo getById(Long ossId);
 
     SysOss upload(MultipartFile file);
 

ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -1,9 +1,11 @@
 package com.ruoyi.system.service;
 
+import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.dto.RoleDTO;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -13,9 +15,7 @@ import com.ruoyi.common.core.service.LogininforService;
 import com.ruoyi.common.enums.DeviceType;
 import com.ruoyi.common.enums.LoginType;
 import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserException;
+import com.ruoyi.common.exception.user.*;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
@@ -24,6 +24,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -46,6 +47,12 @@ public class SysLoginService {
     private final LogininforService asyncService;
     private final SysPermissionService permissionService;
 
+    @Value("${user.password.maxRetryCount}")
+    private Integer maxRetryCount;
+
+    @Value("${user.password.lockTime}")
+    private Integer lockTime;
+
     /**
      * 登录验证
      *
@@ -57,9 +64,9 @@ public class SysLoginService {
      */
     public String login(String username, String password, String code, String uuid) {
         HttpServletRequest request = ServletUtils.getRequest();
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
         // 验证码开关
-        if (captchaOnOff) {
+        if (captchaEnabled) {
             validateCaptcha(username, code, uuid, request);
         }
         SysUser user = loadUserByUsername(username);
@@ -113,16 +120,23 @@ public class SysLoginService {
         return StpUtil.getTokenValue();
     }
 
-
-    public void logout(String loginName) {
-        asyncService.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success"), ServletUtils.getRequest());
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            String username = LoginHelper.getUsername();
+            StpUtil.logout();
+            asyncService.recordLogininfor(username, Constants.LOGOUT, MessageUtils.message("user.logout.success"), ServletUtils.getRequest());
+        } catch (NotLoginException e) {
+        }
     }
 
     /**
      * 校验短信验证码
      */
     private boolean validateSmsCode(String phonenumber, String smsCode, HttpServletRequest request) {
-        String code = RedisUtils.getCacheObject(Constants.CAPTCHA_CODE_KEY + phonenumber);
+        String code = RedisUtils.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + phonenumber);
         if (StringUtils.isBlank(code)) {
             asyncService.recordLogininfor(phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"), request);
             throw new CaptchaExpireException();
@@ -138,7 +152,7 @@ public class SysLoginService {
      * @param uuid     唯一标识
      */
     public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) {
-        String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
         String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.deleteObject(verifyKey);
         if (captcha == null) {
@@ -235,27 +249,25 @@ public class SysLoginService {
      */
     private void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
         HttpServletRequest request = ServletUtils.getRequest();
-        String errorKey = Constants.LOGIN_ERROR + username;
-        Integer errorLimitTime = Constants.LOGIN_ERROR_LIMIT_TIME;
-        Integer setErrorNumber = Constants.LOGIN_ERROR_NUMBER;
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
         String loginFail = Constants.LOGIN_FAIL;
 
         // 获取用户登录错误次数(可自定义限制策略 例如: key + username + ip)
         Integer errorNumber = RedisUtils.getCacheObject(errorKey);
         // 锁定时间内登录 则踢出
-        if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(setErrorNumber)) {
-            asyncService.recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), errorLimitTime), request);
-            throw new UserException(loginType.getRetryLimitExceed(), errorLimitTime);
+        if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
+            asyncService.recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime), request);
+            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
         }
 
         if (supplier.get()) {
             // 是否第一次
             errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
             // 达到规定错误次数 则锁定登录
-            if (errorNumber.equals(setErrorNumber)) {
-                RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(errorLimitTime));
-                asyncService.recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), errorLimitTime), request);
-                throw new UserException(loginType.getRetryLimitExceed(), errorLimitTime);
+            if (errorNumber.equals(maxRetryCount)) {
+                RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+                asyncService.recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime), request);
+                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
             } else {
                 // 未达到规定错误次数 则递增
                 RedisUtils.setCacheObject(errorKey, errorNumber);

ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java

@@ -1,10 +1,12 @@
 package com.ruoyi.system.service;
 
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -48,7 +50,17 @@ public class SysPermissionService {
         if (user.isAdmin()) {
             perms.add("*:*:*");
         } else {
-            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+            List<SysRole> roles = user.getRoles();
+            if (!roles.isEmpty() && roles.size() > 1) {
+                // 多角色设置permissions属性，以便数据权限匹配权限
+                for (SysRole role : roles) {
+                    Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
+                    role.setPermissions(rolePerms);
+                    perms.addAll(rolePerms);
+                }
+            } else {
+                perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+            }
         }
         return perms;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
 import cn.dev33.satoken.secure.BCrypt;
+import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -42,9 +43,9 @@ public class SysRegisterService {
         // 校验用户类型是否存在
         String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
 
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
         // 验证码开关
-        if (captchaOnOff) {
+        if (captchaEnabled) {
             validateCaptcha(username, registerBody.getCode(), registerBody.getUuid(), request);
         }
 
@@ -72,7 +73,7 @@ public class SysRegisterService {
      * @return 结果
      */
     public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) {
-        String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
         String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.deleteObject(verifyKey);
         if (captcha == null) {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -5,22 +5,23 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.service.ConfigService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -66,16 +67,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @param configKey 参数key
      * @return 参数键值
      */
+    @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
     @Override
     public String selectConfigByKey(String configKey) {
-        String configValue = RedisUtils.getCacheObject(getCacheKey(configKey));
-        if (StringUtils.isNotEmpty(configValue)) {
-            return configValue;
-        }
         SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
             .eq(SysConfig::getConfigKey, configKey));
         if (ObjectUtil.isNotNull(retConfig)) {
-            RedisUtils.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
         }
         return StringUtils.EMPTY;
@@ -87,12 +84,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @return true开启，false关闭
      */
     @Override
-    public boolean selectCaptchaOnOff() {
-        String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
-        if (StringUtils.isEmpty(captchaOnOff)) {
+    public boolean selectCaptchaEnabled() {
+        String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled");
+        if (StringUtils.isEmpty(captchaEnabled)) {
             return true;
         }
-        return Convert.toBool(captchaOnOff);
+        return Convert.toBool(captchaEnabled);
     }
 
     /**
@@ -119,13 +116,14 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @param config 参数配置信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#config.configKey")
     @Override
-    public int insertConfig(SysConfig config) {
+    public String insertConfig(SysConfig config) {
         int row = baseMapper.insert(config);
         if (row > 0) {
-            RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+            return config.getConfigValue();
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
     /**
@@ -134,8 +132,9 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @param config 参数配置信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#config.configKey")
     @Override
-    public int updateConfig(SysConfig config) {
+    public String updateConfig(SysConfig config) {
         int row = 0;
         if (config.getConfigId() != null) {
             row = baseMapper.updateById(config);
@@ -144,9 +143,9 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
                 .eq(SysConfig::getConfigKey, config.getConfigKey()));
         }
         if (row > 0) {
-            RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+            return config.getConfigValue();
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
     /**
@@ -161,7 +160,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
             if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
                 throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
-            RedisUtils.deleteObject(getCacheKey(config.getConfigKey()));
+            CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
         }
         baseMapper.deleteBatchIds(Arrays.asList(configIds));
     }
@@ -172,9 +171,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Override
     public void loadingConfigCache() {
         List<SysConfig> configsList = selectConfigList(new SysConfig());
-        for (SysConfig config : configsList) {
-            RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
+        configsList.forEach(config ->
+            CacheUtils.put(CacheNames.SYS_CONFIG, config.getConfigKey(), config.getConfigValue()));
     }
 
     /**
@@ -182,8 +180,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      */
     @Override
     public void clearConfigCache() {
-        Collection<String> keys = RedisUtils.keys(Constants.SYS_CONFIG_KEY + "*");
-        RedisUtils.deleteObject(keys);
+        CacheUtils.clear(CacheNames.SYS_CONFIG);
     }
 
     /**
@@ -211,11 +208,6 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         return UserConstants.UNIQUE;
     }
 
-    @Override
-    public SysConfig getOne(SysConfig config) {
-        return baseMapper.selectOne(new LambdaQueryWrapper<>(config));
-    }
-
     /**
      * 根据参数 key 获取参数值
      *
@@ -227,13 +219,4 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         return selectConfigByKey(configKey);
     }
 
-    /**
-     * 设置cache key
-     *
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    private String getCacheKey(String configKey) {
-        return Constants.SYS_CONFIG_KEY + configKey;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.helper.DataBaseHelper;
+import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.system.domain.SysRoleDept;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleDeptMapper;
@@ -13,7 +14,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 数据权限 实现
@@ -37,7 +37,7 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
                 .select(SysRoleDept::getDeptId)
                 .eq(SysRoleDept::getRoleId, roleId));
         if (CollUtil.isNotEmpty(list)) {
-            return list.stream().map(rd -> Convert.toStr(rd.getDeptId())).collect(Collectors.joining(","));
+            return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
         }
         return null;
     }
@@ -47,13 +47,13 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
         List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
             .select(SysDept::getDeptId)
             .apply(DataBaseHelper.findInSet(deptId, "ancestors")));
-        List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
         ids.add(deptId);
         List<SysDept> list = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
             .select(SysDept::getDeptId)
             .in(SysDept::getDeptId, ids));
         if (CollUtil.isNotEmpty(list)) {
-            return list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(","));
+            return StreamUtils.join(list, d -> Convert.toStr(d.getDeptId()));
         }
         return null;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -58,6 +58,18 @@ public class SysDeptServiceImpl implements ISysDeptService {
         return baseMapper.selectDeptList(lqw);
     }
 
+    /**
+     * 查询部门树结构信息
+     *
+     * @param dept 部门信息
+     * @return 部门树信息集合
+     */
+    @Override
+    public List<Tree<Long>> selectDeptTreeList(SysDept dept) {
+        List<SysDept> depts = this.selectDeptList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
     /**
      * 构建前端所需要下拉树结构
      *
@@ -96,7 +108,11 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public SysDept selectDeptById(Long deptId) {
-        return baseMapper.selectById(deptId);
+        SysDept dept = baseMapper.selectById(deptId);
+        SysDept parentDept = baseMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+            .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId()));
+        dept.setParentName(ObjectUtil.isNotNull(parentDept) ? parentDept.getDeptName() : null);
+        return dept;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -2,15 +2,17 @@ package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -89,8 +91,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         for (Long dictCode : dictCodes) {
             SysDictData data = selectDictDataById(dictCode);
             baseMapper.deleteById(dictCode);
-            List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
-            RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas);
+            CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType());
         }
     }
 
@@ -100,14 +101,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      * @param data 字典数据信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#data.dictType")
     @Override
-    public int insertDictData(SysDictData data) {
+    public List<SysDictData> insertDictData(SysDictData data) {
         int row = baseMapper.insert(data);
         if (row > 0) {
-            List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
-            RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas);
+            return baseMapper.selectDictDataByType(data.getDictType());
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
     /**
@@ -116,23 +117,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      * @param data 字典数据信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#data.dictType")
     @Override
-    public int updateDictData(SysDictData data) {
+    public List<SysDictData> updateDictData(SysDictData data) {
         int row = baseMapper.updateById(data);
         if (row > 0) {
-            List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
-            RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas);
+            return baseMapper.selectDictDataByType(data.getDictType());
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
-    /**
-     * 设置cache key
-     *
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    String getCacheKey(String configKey) {
-        return Constants.SYS_DICT_KEY + configKey;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -13,17 +13,19 @@ import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.service.DictService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.mapper.SysDictTypeMapper;
 import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 字典 业务层处理
@@ -83,17 +85,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
+    @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
     @Override
     public List<SysDictData> selectDictDataByType(String dictType) {
-        List<SysDictData> dictDatas = RedisUtils.getCacheObject(getCacheKey(dictType));
+        List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
         if (CollUtil.isNotEmpty(dictDatas)) {
             return dictDatas;
         }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (CollUtil.isNotEmpty(dictDatas)) {
-            RedisUtils.setCacheObject(getCacheKey(dictType), dictDatas);
-            return dictDatas;
-        }
         return null;
     }
 
@@ -114,6 +112,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      * @param dictType 字典类型
      * @return 字典类型
      */
+    @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
     @Override
     public SysDictType selectDictTypeByType(String dictType) {
         return baseMapper.selectById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
@@ -132,7 +131,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
                 .eq(SysDictData::getDictType, dictType.getDictType()))) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
-            RedisUtils.deleteObject(getCacheKey(dictType.getDictType()));
+            CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType());
         }
         baseMapper.deleteBatchIds(Arrays.asList(dictIds));
     }
@@ -144,13 +143,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     public void loadingDictCache() {
         List<SysDictData> dictDataList = dictDataMapper.selectList(
             new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, UserConstants.DICT_NORMAL));
-        Map<String, List<SysDictData>> dictDataMap = dictDataList.stream().collect(Collectors.groupingBy(SysDictData::getDictType));
+        Map<String, List<SysDictData>> dictDataMap = StreamUtils.groupByKey(dictDataList, SysDictData::getDictType);
         dictDataMap.forEach((k,v) -> {
-            String dictKey = getCacheKey(k);
-            List<SysDictData> dictList = v.stream()
-                .sorted(Comparator.comparing(SysDictData::getDictSort))
-                .collect(Collectors.toList());
-            RedisUtils.setCacheObject(dictKey, dictList);
+            List<SysDictData> dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictData::getDictSort));
+            CacheUtils.put(CacheNames.SYS_DICT, k, dictList);
         });
     }
 
@@ -159,8 +155,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      */
     @Override
     public void clearDictCache() {
-        Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
-        RedisUtils.deleteObject(keys);
+        CacheUtils.clear(CacheNames.SYS_DICT);
     }
 
     /**
@@ -178,13 +173,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      * @param dict 字典类型信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
     @Override
-    public int insertDictType(SysDictType dict) {
+    public List<SysDictData> insertDictType(SysDictType dict) {
         int row = baseMapper.insert(dict);
         if (row > 0) {
-            RedisUtils.setCacheObject(getCacheKey(dict.getDictType()), null);
+            return new ArrayList<>();
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
     /**
@@ -193,19 +189,20 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      * @param dict 字典类型信息
      * @return 结果
      */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateDictType(SysDictType dict) {
+    public List<SysDictData> updateDictType(SysDictType dict) {
         SysDictType oldDict = baseMapper.selectById(dict.getDictId());
         dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
             .set(SysDictData::getDictType, dict.getDictType())
             .eq(SysDictData::getDictType, oldDict.getDictType()));
         int row = baseMapper.updateById(dict);
         if (row > 0) {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
-            RedisUtils.setCacheObject(getCacheKey(dict.getDictType()), dictDatas);
+            CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType());
+            return dictDataMapper.selectDictDataByType(dict.getDictType());
         }
-        return row;
+        throw new ServiceException("操作失败");
     }
 
     /**
@@ -289,13 +286,4 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         return StringUtils.stripEnd(propertyString.toString(), separator);
     }
 
-    /**
-     * 设置cache key
-     *
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    String getCacheKey(String configKey) {
-        return Constants.SYS_DICT_KEY + configKey;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -97,6 +97,24 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return permsSet;
     }
 
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectMenuPermsByRoleId(Long roleId) {
+        List<String> perms = baseMapper.selectMenuPermsByRoleId(roleId);
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
+                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
     /**
      * 根据用户ID查询菜单
      *
@@ -429,7 +447,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return
      */
     public String innerLinkReplaceEach(String path) {
-        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS},
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "." },
             new String[]{"", ""});
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java

@@ -7,13 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
+import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.oss.constant.OssConstant;
 import com.ruoyi.oss.factory.OssFactory;
@@ -54,7 +55,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
         for (SysOssConfig config : list) {
             String configKey = config.getConfigKey();
             if ("0".equals(config.getStatus())) {
-                RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, configKey);
+                RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
             }
             setConfigCache(true, config);
         }
@@ -120,16 +121,15 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
                 throw new ServiceException("系统内置, 不可删除!");
             }
         }
-        List<SysOssConfig> list = Lists.newArrayList();
+        List<SysOssConfig> list = CollUtil.newArrayList();
         for (Long configId : ids) {
             SysOssConfig config = baseMapper.selectById(configId);
             list.add(config);
         }
         boolean flag = baseMapper.deleteBatchIds(ids) > 0;
         if (flag) {
-            list.stream().forEach(sysOssConfig -> {
-                RedisUtils.deleteObject(getCacheKey(sysOssConfig.getConfigKey()));
-            });
+            list.forEach(sysOssConfig ->
+                CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey()));
         }
         return flag;
     }
@@ -159,21 +159,11 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
             .set(SysOssConfig::getStatus, "1"));
         row += baseMapper.updateById(sysOssConfig);
         if (row > 0) {
-            RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey());
+            RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey());
         }
         return row;
     }
 
-    /**
-     * 设置cache key
-     *
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    private String getCacheKey(String configKey) {
-        return OssConstant.SYS_OSS_KEY + configKey;
-    }
-
     /**
      * 如果操作成功 则更新缓存
      *
@@ -183,10 +173,8 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
      */
     private boolean setConfigCache(boolean flag, SysOssConfig config) {
         if (flag) {
-            RedisUtils.setCacheObject(
-                getCacheKey(config.getConfigKey()),
-                JsonUtils.toJsonString(config));
-            RedisUtils.publish(OssConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+            RedisUtils.publish(OssConstant.DEFAULT_CONFIG_KEY, config.getConfigKey(), msg -> {
                 log.info("发布刷新OSS配置 => " + msg);
             });
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -4,12 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
-import com.ruoyi.oss.constant.OssConstant;
 import com.ruoyi.oss.core.OssClient;
 import com.ruoyi.oss.entity.UploadResult;
 import com.ruoyi.oss.factory.OssFactory;
@@ -19,11 +18,11 @@ import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.mapper.SysOssMapper;
 import com.ruoyi.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -51,13 +50,10 @@ public class SysOssServiceImpl implements ISysOssService {
     public List<SysOssVo> listByIds(Collection<Long> ossIds) {
         List<SysOssVo> list = new ArrayList<>();
         for (Long id : ossIds) {
-            String key = OssConstant.SYS_OSS_KEY + id;
-            SysOssVo vo = RedisUtils.getCacheObject(key);
-            if (ObjectUtil.isNull(vo)) {
-                vo = baseMapper.selectVoById(id);
-                RedisUtils.setCacheObject(key, vo, Duration.ofDays(30));
+            SysOssVo vo = getById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                list.add(vo);
             }
-            list.add(vo);
         }
         return list;
     }
@@ -76,9 +72,10 @@ public class SysOssServiceImpl implements ISysOssService {
         return lqw;
     }
 
+    @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
     @Override
-    public SysOss getById(Long ossId) {
-        return baseMapper.selectById(ossId);
+    public SysOssVo getById(Long ossId) {
+        return baseMapper.selectVoById(ossId);
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.DataBaseHelper;
 import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.domain.SysUserPost;
@@ -33,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 用户 业务层处理
@@ -83,7 +83,7 @@ public class SysUserServiceImpl implements ISysUserService {
                 List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                     .select(SysDept::getDeptId)
                     .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors")));
-                List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
                 ids.add(user.getDeptId());
                 w.in("u.dept_id", ids);
             });
@@ -172,7 +172,7 @@ public class SysUserServiceImpl implements ISysUserService {
         if (CollUtil.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
-        return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
+        return StreamUtils.join(list, SysRole::getRoleName);
     }
 
     /**
@@ -187,7 +187,7 @@ public class SysUserServiceImpl implements ISysUserService {
         if (CollUtil.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
-        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
+        return StreamUtils.join(list, SysPost::getPostName);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java

@@ -1,7 +1,6 @@
 package com.ruoyi.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 /**
@@ -12,7 +11,6 @@ import lombok.Data;
  */
 @Data
 @TableName("wf_deploy_form")
-@ApiModel("部署实例和表单关联")
 public class WfDeployForm {
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,34 +18,29 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("流程分类业务对象")
 public class WfCategoryBo extends BaseEntity {
 
     /**
      * 分类ID
      */
-    @ApiModelProperty(value = "分类ID", required = true)
     @NotNull(message = "分类ID不能为空", groups = { EditGroup.class })
     private Long categoryId;
 
     /**
      * 分类名称
      */
-    @ApiModelProperty(value = "分类名称", required = true)
     @NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String categoryName;
 
     /**
      * 分类编码
      */
-    @ApiModelProperty(value = "分类编码", required = true)
     @NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String code;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注", required = true)
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCopyBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,68 +18,58 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("流程抄送业务对象")
 public class WfCopyBo extends BaseEntity {
 
     /**
      * 抄送主键
      */
-    @ApiModelProperty(value = "抄送主键", required = true)
     @NotNull(message = "抄送主键不能为空", groups = { EditGroup.class })
     private Long copyId;
 
     /**
      * 抄送标题
      */
-    @ApiModelProperty(value = "抄送标题", required = true)
     @NotNull(message = "抄送标题不能为空", groups = { AddGroup.class, EditGroup.class })
     private String title;
 
     /**
      * 流程主键
      */
-    @ApiModelProperty(value = "流程主键", required = true)
     @NotBlank(message = "流程主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private String processId;
 
     /**
      * 流程名称
      */
-    @ApiModelProperty(value = "流程名称", required = true)
     @NotBlank(message = "流程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String processName;
 
     /**
      * 流程分类主键
      */
-    @ApiModelProperty(value = "流程分类主键", required = true)
     @NotBlank(message = "流程分类主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private String categoryId;
 
     /**
      * 任务主键
      */
-    @ApiModelProperty(value = "任务主键", required = true)
     @NotBlank(message = "任务主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taskId;
 
     /**
      * 用户主键
      */
-    @ApiModelProperty(value = "用户主键", required = true)
     @NotNull(message = "用户主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long userId;
 
     /**
      * 发起人Id
      */
-    @ApiModelProperty(value = "发起人主键", required = true)
     @NotNull(message = "发起人主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long originatorId;
     /**
      * 发起人名称
      */
-    @ApiModelProperty(value = "发起人名称", required = true)
     @NotNull(message = "发起人名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String originatorName;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfDesignerBo.java

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -16,20 +14,17 @@ import javax.validation.constraints.NotNull;
  * @createTime 2022/3/10 00:12
  */
 @Data
-@ApiModel("流程设计业务对象")
 public class WfDesignerBo {
 
     /**
      * 流程名称
      */
-    @ApiModelProperty(value = "流程名称", required = true)
     @NotNull(message = "流程名称", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 流程分类
      */
-    @ApiModelProperty(value = "流程分类", required = true)
     @NotBlank(message = "流程分类", groups = { AddGroup.class, EditGroup.class })
     private String category;
 
@@ -37,6 +32,5 @@ public class WfDesignerBo {
      * XML字符串
      */
     @NotBlank(message = "XML字符串", groups = { AddGroup.class, EditGroup.class })
-    @ApiModelProperty(value = "XML字符串", required = true)
     private String xml;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfFormBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,34 +17,29 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("流程表单业务对象")
 public class WfFormBo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * 表单主键
      */
-    @ApiModelProperty(value = "表单ID", required = true)
     @NotNull(message = "表单ID不能为空", groups = { EditGroup.class })
     private Long formId;
 
     /**
      * 表单名称
      */
-    @ApiModelProperty(value = "表单名称", required = true)
     @NotBlank(message = "表单名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String formName;
 
     /**
      * 表单内容
      */
-    @ApiModelProperty(value = "表单内容", required = true)
     @NotBlank(message = "表单内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注", required = true)
     private String remark;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfModelBo.java

@@ -2,49 +2,57 @@ package com.ruoyi.workflow.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
+ * 流程模型对象
+ *
  * @author KonBAI
  * @createTime 2022/6/21 9:16
  */
 @Data
-@ApiModel("流程模型对象")
 public class WfModelBo {
-
-    @ApiModelProperty(value = "模型主键")
+    /**
+     * 模型主键
+     */
     @NotNull(message = "模型主键不能为空", groups = { EditGroup.class })
     private String modelId;
-
-    @ApiModelProperty(value = "模型名称", required = true)
+    /**
+     * 模型名称
+     */
     @NotNull(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modelName;
-
-    @ApiModelProperty(value = "模型Key", required = true)
+    /**
+     * 模型Key
+     */
     @NotNull(message = "模型Key不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modelKey;
-
-    @ApiModelProperty(value = "流程分类", required = true)
+    /**
+     * 流程分类
+     */
     @NotBlank(message = "流程分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String category;
-
-    @ApiModelProperty(value = "描述")
+    /**
+     * 描述
+     */
     private String description;
-
-    @ApiModelProperty(value = "表单类型", required = true)
+    /**
+     * 表单类型
+     */
     private Integer formType;
-
-    @ApiModelProperty(value = "表单主键", required = true)
+    /**
+     * 表单主键
+     */
     private Long formId;
-
-    @ApiModelProperty(value = "流程xml", required = true)
+    /**
+     * 流程xml
+     */
     private String bpmnXml;
-
-    @ApiModelProperty(value = "是否保存为新版本", required = true)
+    /**
+     * 是否保存为新版本
+     */
     private Boolean newVersion;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfProcessBo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.workflow.domain.bo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,18 +9,25 @@ import lombok.Data;
  * @createTime 2022/6/11 01:15
  */
 @Data
-@ApiModel("流程业务对象")
 public class WfProcessBo {
 
-    @ApiModelProperty("流程标识")
+    /**
+     * 流程标识
+     */
     private String processKey;
 
-    @ApiModelProperty("流程名称")
+    /**
+     * 流程名称
+     */
     private String processName;
 
-    @ApiModelProperty("流程分类")
+    /**
+     * 流程分类
+     */
     private String category;
 
-    @ApiModelProperty("状态")
+    /**
+     * 状态
+     */
     private String state;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.workflow.domain.bo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -14,39 +12,49 @@ import java.util.Map;
  * @createTime 2022/3/10 00:12
  */
 @Data
-@ApiModel("流程任务业务对象")
 public class WfTaskBo {
-
-    @ApiModelProperty("任务Id")
+    /**
+     * 任务Id
+     */
     private String taskId;
-
-    @ApiModelProperty("任务名称")
+    /**
+     * 任务名称
+     */
     private String taskName;
-
-    @ApiModelProperty("用户Id")
+    /**
+     * 用户Id
+     */
     private String userId;
-
-    @ApiModelProperty("任务意见")
+    /**
+     * 任务意见
+     */
     private String comment;
-
-    @ApiModelProperty("流程实例Id")
+    /**
+     * 流程实例Id
+     */
     private String procInsId;
-
-    @ApiModelProperty("节点")
+    /**
+     * 节点
+     */
     private String targetKey;
-
-    @ApiModelProperty("流程变量信息")
+    /**
+     * 流程变量信息
+     */
     private Map<String, Object> variables;
-
-    @ApiModelProperty("审批人")
+    /**
+     * 审批人
+     */
     private String assignee;
-
-    @ApiModelProperty("候选人")
+    /**
+     * 候选人
+     */
     private List<String> candidateUsers;
-
-    @ApiModelProperty("审批组")
+    /**
+     * 审批组
+     */
     private List<String> candidateGroups;
-
-    @ApiModelProperty("抄送用户Id")
+    /**
+     * 抄送用户Id
+     */
     private String copyUserIds;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCategoryVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -15,7 +13,6 @@ import lombok.Data;
  * @date 2022-01-15
  */
 @Data
-@ApiModel("流程分类视图对象")
 @ExcelIgnoreUnannotated
 public class WfCategoryVo {
 
@@ -25,28 +22,24 @@ public class WfCategoryVo {
      * 分类ID
      */
     @ExcelProperty(value = "分类ID")
-    @ApiModelProperty("分类ID")
     private Long categoryId;
 
     /**
      * 分类名称
      */
     @ExcelProperty(value = "分类名称")
-    @ApiModelProperty("分类名称")
     private String categoryName;
 
     /**
      * 分类编码
      */
     @ExcelProperty(value = "分类编码")
-    @ApiModelProperty("分类编码")
     private String code;
 
     /**
      * 备注
      */
     @ExcelProperty(value = "备注")
-    @ApiModelProperty("备注")
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCommentVo.java

@@ -1,16 +1,16 @@
 package com.ruoyi.workflow.domain.vo;
 
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.util.Date;
 
 /**
+ * 流程批复视图对象
+ *
  * @author konbai
  * @createTime 2022/4/4 02:03
  */
 @Data
-@ApiModel("流程批复视图对象")
 public class WfCommentVo {
 
     /**

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCopyVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
  * @date 2022-05-19
  */
 @Data
-@ApiModel("流程抄送视图对象")
 @ExcelIgnoreUnannotated
 public class WfCopyVo {
 
@@ -26,83 +23,71 @@ public class WfCopyVo {
      * 抄送主键
      */
     @ExcelProperty(value = "抄送主键")
-    @ApiModelProperty("抄送主键")
     private Long copyId;
 
     /**
      * 抄送标题
      */
     @ExcelProperty(value = "抄送标题")
-    @ApiModelProperty("抄送标题")
     private String title;
 
     /**
      * 流程主键
      */
     @ExcelProperty(value = "流程主键")
-    @ApiModelProperty("流程主键")
     private String processId;
 
     /**
      * 流程名称
      */
     @ExcelProperty(value = "流程名称")
-    @ApiModelProperty("流程名称")
     private String processName;
 
     /**
      * 流程分类主键
      */
     @ExcelProperty(value = "流程分类主键")
-    @ApiModelProperty("流程分类主键")
     private String categoryId;
 
     /**
      * 部署主键
      */
     @ExcelProperty(value = "部署主键")
-    @ApiModelProperty("部署主键")
     private String deploymentId;
 
     /**
      * 流程实例主键
      */
     @ExcelProperty(value = "流程实例主键")
-    @ApiModelProperty("流程实例主键")
     private String instanceId;
 
     /**
      * 任务主键
      */
     @ExcelProperty(value = "任务主键")
-    @ApiModelProperty("任务主键")
     private String taskId;
 
     /**
      * 用户主键
      */
     @ExcelProperty(value = "用户主键")
-    @ApiModelProperty("用户主键")
     private Long userId;
 
     /**
      * 发起人Id
      */
     @ExcelProperty(value = "发起人主键")
-    @ApiModelProperty("发起人主键")
     private Long originatorId;
 
     /**
      * 发起人名称
      */
     @ExcelProperty(value = "发起人名称")
-    @ApiModelProperty("发起人名称")
     private String originatorName;
 
     /**
      * 抄送时间（创建时间）
      */
     @ExcelProperty(value = "抄送时间")
-    @ApiModelProperty("抄送时间")
     private Date createTime;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,7 +15,6 @@ import java.util.Date;
  * @date 2022-01-17
  */
 @Data
-@ApiModel("流程定义视图对象")
 @ExcelIgnoreUnannotated
 public class WfDefinitionVo {
 
@@ -27,65 +24,59 @@ public class WfDefinitionVo {
      * 流程定义ID
      */
     @ExcelProperty(value = "流程定义ID")
-    @ApiModelProperty("流程定义ID")
     private String definitionId;
 
     /**
      * 流程名称
      */
     @ExcelProperty(value = "流程名称")
-    @ApiModelProperty("流程名称")
     private String processName;
 
     /**
      * 流程Key
      */
     @ExcelProperty(value = "流程Key")
-    @ApiModelProperty("流程Key")
     private String processKey;
 
     /**
      * 分类编码
      */
     @ExcelProperty(value = "分类编码")
-    @ApiModelProperty("分类编码")
     private String category;
 
-    @ApiModelProperty("版本")
+    /**
+     * 版本
+     */
+    @ExcelProperty(value = "版本")
     private Integer version;
 
     /**
      * 表单ID
      */
     @ExcelProperty(value = "表单ID")
-    @ApiModelProperty("表单ID")
     private Long formId;
 
     /**
      * 表单名称
      */
     @ExcelProperty(value = "表单名称")
-    @ApiModelProperty("表单名称")
     private String formName;
 
     /**
      * 部署ID
      */
     @ExcelProperty(value = "部署ID")
-    @ApiModelProperty("部署ID")
     private String deploymentId;
 
     /**
      * 流程定义状态: 1:激活 , 2:中止
      */
     @ExcelProperty(value = "流程定义状态: 1:激活 , 2:中止")
-    @ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
     private Boolean suspended;
 
     /**
      * 部署时间
      */
     @ExcelProperty(value = "部署时间")
-    @ApiModelProperty("部署时间")
     private Date deploymentTime;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java

@@ -1,15 +1,14 @@
 package com.ruoyi.workflow.domain.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
+ * 部署实例和表单关联视图对象
+ *
  * @author KonBAI
  * @createTime 2022/7/17 18:29
  */
 @Data
-@ApiModel("部署实例和表单关联视图对象")
 public class WfDeployFormVo {
 
     private static final long serialVersionUID = 1L;
@@ -17,30 +16,25 @@ public class WfDeployFormVo {
     /**
      * 流程部署主键
      */
-    @ApiModelProperty("流程部署主键")
     private String deployId;
 
     /**
      * 表单Key
      */
-    @ApiModelProperty("表单Key")
     private String formKey;
 
     /**
      * 节点Key
      */
-    @ApiModelProperty("节点Key")
     private String nodeKey;
 
     /**
      * 节点名称
      */
-    @ApiModelProperty("节点名称")
     private String nodeName;
 
     /**
      * 表单内容
      */
-    @ApiModelProperty("表单内容")
     private String content;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
  * @date 2022-06-30
  */
 @Data
-@ApiModel("流程部署视图对象")
 @ExcelIgnoreUnannotated
 public class WfDeployVo {
 
@@ -26,65 +23,58 @@ public class WfDeployVo {
      * 流程定义ID
      */
     @ExcelProperty(value = "流程定义ID")
-    @ApiModelProperty("流程定义ID")
     private String definitionId;
 
     /**
      * 流程名称
      */
     @ExcelProperty(value = "流程名称")
-    @ApiModelProperty("流程名称")
     private String processName;
 
     /**
      * 流程Key
      */
     @ExcelProperty(value = "流程Key")
-    @ApiModelProperty("流程Key")
     private String processKey;
 
     /**
      * 分类编码
      */
     @ExcelProperty(value = "分类编码")
-    @ApiModelProperty("分类编码")
     private String category;
 
-    @ApiModelProperty("版本")
+    /**
+     * 版本
+     */
     private Integer version;
 
     /**
      * 表单ID
      */
     @ExcelProperty(value = "表单ID")
-    @ApiModelProperty("表单ID")
     private Long formId;
 
     /**
      * 表单名称
      */
     @ExcelProperty(value = "表单名称")
-    @ApiModelProperty("表单名称")
     private String formName;
 
     /**
      * 部署ID
      */
     @ExcelProperty(value = "部署ID")
-    @ApiModelProperty("部署ID")
     private String deploymentId;
 
     /**
      * 流程定义状态: 1:激活 , 2:中止
      */
     @ExcelProperty(value = "流程定义状态: 1:激活 , 2:中止")
-    @ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
     private Boolean suspended;
 
     /**
      * 部署时间
      */
     @ExcelProperty(value = "部署时间")
-    @ApiModelProperty("部署时间")
     private Date deploymentTime;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDetailVo.java

@@ -2,7 +2,6 @@ package com.ruoyi.workflow.domain.vo;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.flowable.core.FormConf;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.util.List;
@@ -14,7 +13,6 @@ import java.util.List;
  * @createTime 2022/8/7 15:01
  */
 @Data
-@ApiModel("流程详情视图对象")
 public class WfDetailVo {
 
     /**

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfFormVo.java

@@ -2,16 +2,15 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
+ * 流程分类视图对象
+ *
  * @author KonBAI
  * @createTime 2022/3/7 22:07
  */
 @Data
-@ApiModel("流程分类视图对象")
 @ExcelIgnoreUnannotated
 public class WfFormVo {
 
@@ -21,27 +20,23 @@ public class WfFormVo {
      * 表单主键
      */
     @ExcelProperty(value = "表单ID")
-    @ApiModelProperty("表单ID")
     private Long formId;
 
     /**
      * 表单名称
      */
     @ExcelProperty(value = "表单名称")
-    @ApiModelProperty("表单名称")
     private String formName;
 
     /**
      * 表单内容
      */
     @ExcelProperty(value = "表单内容")
-    @ApiModelProperty("表单内容")
     private String content;
 
     /**
      * 备注
      */
     @ExcelProperty(value = "备注")
-    @ApiModelProperty("备注")
     private String remark;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfModelVo.java

@@ -2,62 +2,72 @@ package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 /**
+ * 流程模型视图对象
+ *
  * @author KonBAI
  * @createTime 2022/6/21 9:16
  */
 @Data
-@ApiModel("流程模型视图对象")
 @ExcelIgnoreUnannotated
 public class WfModelVo {
-
+    /**
+     * 模型ID
+     */
     @ExcelProperty(value = "模型ID")
-    @ApiModelProperty("模型ID")
     private String modelId;
-
+    /**
+     * 模型名称
+     */
     @ExcelProperty(value = "模型名称")
-    @ApiModelProperty("模型名称")
     private String modelName;
-
+    /**
+     * 模型Key
+     */
     @ExcelProperty(value = "模型Key")
-    @ApiModelProperty("模型Key")
     private String modelKey;
-
+    /**
+     * 分类编码
+     */
     @ExcelProperty(value = "分类编码")
-    @ApiModelProperty("分类编码")
     private String category;
-
+    /**
+     * 版本
+     */
     @ExcelProperty(value = "版本")
-    @ApiModelProperty("版本")
     private Integer version;
-
+    /**
+     * 表单类型
+     */
     @ExcelProperty(value = "表单类型")
-    @ApiModelProperty("表单类型")
     private Integer formType;
-
+    /**
+     * 表单ID
+     */
     @ExcelProperty(value = "表单ID")
-    @ApiModelProperty("表单ID")
     private Long formId;
-
+    /**
+     * 模型描述
+     */
     @ExcelProperty(value = "模型描述")
-    @ApiModelProperty("模型描述")
     private String description;
-
+    /**
+     * 创建时间
+     */
     @ExcelProperty(value = "创建时间")
-    @ApiModelProperty("创建时间")
     private Date createTime;
-
+    /**
+     * 流程xml
+     */
     @ExcelProperty(value = "流程xml")
-    @ApiModelProperty("流程xml")
     private String bpmnXml;
-
+    /**
+     * 表单内容
+     */
     @ExcelProperty(value = "表单内容")
-    @ApiModelProperty("表单内容")
     private String content;
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfTaskVo.java

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.workflow.domain.dto.WfCommentDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.flowable.engine.task.Comment;
 
@@ -19,84 +17,108 @@ import java.util.List;
  * @createTime 2022/3/10 00:12
  */
 @Data
-@ApiModel("工作流任务视图对象")
 @ExcelIgnoreUnannotated
 public class WfTaskVo implements Serializable {
-
-    @ApiModelProperty("任务编号")
+    /**
+     * 任务编号
+     */
     private String taskId;
-
-    @ApiModelProperty("任务名称")
+    /**
+     * 任务名称
+     */
     private String taskName;
-
-    @ApiModelProperty("任务Key")
+    /**
+     * 任务Key
+     */
     private String taskDefKey;
-
-    @ApiModelProperty("任务执行人Id")
+    /**
+     * 任务执行人Id
+     */
     private Long assigneeId;
-
-    @ApiModelProperty("部门名称")
+    /**
+     * 部门名称
+     */
     private String deptName;
-
-    @ApiModelProperty("流程发起人部门名称")
+    /**
+     * 流程发起人部门名称
+     */
     private String startDeptName;
-
-    @ApiModelProperty("任务执行人名称")
+    /**
+     * 任务执行人名称
+     */
     private String assigneeName;
-
-    @ApiModelProperty("流程发起人Id")
+    /**
+     * 流程发起人Id
+     */
     private String startUserId;
-
-    @ApiModelProperty("流程发起人名称")
+    /**
+     * 流程发起人名称
+     */
     private String startUserName;
-
-    @ApiModelProperty("流程类型")
+    /**
+     * 流程类型
+     */
     private String category;
-
-    @ApiModelProperty("流程变量信息")
+    /**
+     * 流程变量信息
+     */
     private Object procVars;
-
-    @ApiModelProperty("局部变量信息")
+    /**
+     * 局部变量信息
+     */
     private Object taskLocalVars;
-
-    @ApiModelProperty("流程部署编号")
+    /**
+     * 流程部署编号
+     */
     private String deployId;
-
-    @ApiModelProperty("流程ID")
+    /**
+     * 流程ID
+     */
     private String procDefId;
-
-    @ApiModelProperty("流程key")
+    /**
+     * 流程key
+     */
     private String procDefKey;
-
-    @ApiModelProperty("流程定义名称")
+    /**
+     * 流程定义名称
+     */
     private String procDefName;
-
-    @ApiModelProperty("流程定义内置使用版本")
+    /**
+     * 流程定义内置使用版本
+     */
     private int procDefVersion;
-
-    @ApiModelProperty("流程实例ID")
+    /**
+     * 流程实例ID
+     */
     private String procInsId;
-
-    @ApiModelProperty("历史流程实例ID")
+    /**
+     * 历史流程实例ID
+     */
     private String hisProcInsId;
-
-    @ApiModelProperty("任务耗时")
+    /**
+     * 任务耗时
+     */
     private String duration;
-
-    @ApiModelProperty("任务意见")
+    /**
+     * 任务意见
+     */
     private WfCommentDto comment;
-
-    @ApiModelProperty("任务意见")
+    /**
+     * 任务意见
+     */
     private List<Comment> commentList;
-
-    @ApiModelProperty("候选执行人")
+    /**
+     * 候选执行人
+     */
     private String candidate;
-
-    @ApiModelProperty("任务创建时间")
+    /**
+     * 任务创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-
-    @ApiModelProperty("任务完成时间")
+    /**
+     * 任务完成时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfViewerVo.java

@@ -1,7 +1,6 @@
 package com.ruoyi.workflow.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +16,6 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("任务追踪视图对象")
 @ExcelIgnoreUnannotated
 public class WfViewerVo {
 

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -378,7 +377,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
             .desc();
         int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
         List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(offset, pageQuery.getPageSize());
-        List<WfTaskVo> hisTaskList = Lists.newArrayList();
+        List<WfTaskVo> hisTaskList = new ArrayList<>();
         for (HistoricTaskInstance histTask : historicTaskInstanceList) {
             WfTaskVo flowTask = new WfTaskVo();
             // 当前流程信息