wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update ruoyi原生改为 MP lombok 格式 

update SysConfig 模块代码
This commit is contained in:
疯狂的狮子li 2021-04-12 17:02:55 +08:00
parent d48946ab90
commit 4500db395f
72 changed files with 2954 additions and 4221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -1,24 +1,34 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.ArrayList; import com.baomidou.mybatisplus.annotation.*;
import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.ArrayList;
import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity; import java.util.List;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysDept extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dept")
public class SysDept
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 部门ID */ /** 部门ID */
@TableId(value = "dept_id",type = IdType.AUTO)
private Long deptId; private Long deptId;
/** 父部门ID */ /** 父部门ID */
@ -28,175 +38,54 @@ public class SysDept extends BaseEntity
private String ancestors; private String ancestors;
/** 部门名称 */ /** 部门名称 */
@NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
private String deptName; private String deptName;
/** 显示顺序 */ /** 显示顺序 */
@NotBlank(message = "显示顺序不能为空")
private String orderNum; private String orderNum;
/** 负责人 */ /** 负责人 */
private String leader; private String leader;
/** 联系电话 */ /** 联系电话 */
@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
private String phone; private String phone;
/** 邮箱 */ /** 邮箱 */
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
private String email; private String email;
/** 部门状态:0正常,1停用 */ /** 部门状态:0正常,1停用 */
private String status; private String status;
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */
@TableLogic
private String delFlag; private String delFlag;
/** 父部门名称 */ /** 父部门名称 */
private String parentName; private String parentName;
/** 创建者 */
private String createBy;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 子部门 */ /** 子部门 */
@TableField(exist = false)
private List<SysDept> children = new ArrayList<SysDept>(); private List<SysDept> children = new ArrayList<SysDept>();
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getParentId()
{
return parentId;
}
public void setParentId(Long parentId)
{
this.parentId = parentId;
}
public String getAncestors()
{
return ancestors;
}
public void setAncestors(String ancestors)
{
this.ancestors = ancestors;
}
@NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
@NotBlank(message = "显示顺序不能为空")
public String getOrderNum()
{
return orderNum;
}
public void setOrderNum(String orderNum)
{
this.orderNum = orderNum;
}
public String getLeader()
{
return leader;
}
public void setLeader(String leader)
{
this.leader = leader;
}
@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
public String getPhone()
{
return phone;
}
public void setPhone(String phone)
{
this.phone = phone;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail()
{
return email;
}
public void setEmail(String email)
{
this.email = email;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getParentName()
{
return parentName;
}
public void setParentName(String parentName)
{
this.parentName = parentName;
}
public List<SysDept> getChildren()
{
return children;
}
public void setChildren(List<SysDept> children)
{
this.children = children;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("deptId", getDeptId())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
} }

154
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -1,25 +1,35 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import javax.validation.constraints.NotBlank; import com.baomidou.mybatisplus.annotation.*;
import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
/** /**
* 字典数据表 sys_dict_data * 字典数据表 sys_dict_data
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysDictData extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dict_data")
public class SysDictData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 字典编码 */ /** 字典编码 */
@Excel(name = "字典编码", cellType = ColumnType.NUMERIC) @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
@TableId(value = "dept_code",type = IdType.AUTO)
private Long dictCode; private Long dictCode;
/** 字典排序 */ /** 字典排序 */
@ -28,17 +38,24 @@ public class SysDictData extends BaseEntity
/** 字典标签 */ /** 字典标签 */
@Excel(name = "字典标签") @Excel(name = "字典标签")
@NotBlank(message = "字典标签不能为空")
@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
private String dictLabel; private String dictLabel;
/** 字典键值 */ /** 字典键值 */
@Excel(name = "字典键值") @Excel(name = "字典键值")
@NotBlank(message = "字典键值不能为空")
@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
private String dictValue; private String dictValue;
/** 字典类型 */ /** 字典类型 */
@Excel(name = "字典类型") @Excel(name = "字典类型")
@NotBlank(message = "字典类型不能为空")
@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
private String dictType; private String dictType;
/** 样式属性（其他样式扩展） */ /** 样式属性（其他样式扩展） */
@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
private String cssClass; private String cssClass;
/** 表格字典样式 */ /** 表格字典样式 */
@ -52,125 +69,28 @@ public class SysDictData extends BaseEntity
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
public Long getDictCode() /** 创建者 */
{ private String createBy;
return dictCode;
}
public void setDictCode(Long dictCode) /** 创建时间 */
{ @TableField(fill = FieldFill.INSERT)
this.dictCode = dictCode; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
} private Date createTime;
public Long getDictSort() /** 更新者 */
{ private String updateBy;
return dictSort;
}
public void setDictSort(Long dictSort) /** 更新时间 */
{ @TableField(fill = FieldFill.INSERT_UPDATE)
this.dictSort = dictSort; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
} private Date updateTime;
@NotBlank(message = "字典标签不能为空") /** 备注 */
@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") private String remark;
public String getDictLabel()
{
return dictLabel;
}
public void setDictLabel(String dictLabel)
{
this.dictLabel = dictLabel;
}
@NotBlank(message = "字典键值不能为空")
@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
public String getDictValue()
{
return dictValue;
}
public void setDictValue(String dictValue)
{
this.dictValue = dictValue;
}
@NotBlank(message = "字典类型不能为空")
@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
public String getDictType()
{
return dictType;
}
public void setDictType(String dictType)
{
this.dictType = dictType;
}
@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
public String getCssClass()
{
return cssClass;
}
public void setCssClass(String cssClass)
{
this.cssClass = cssClass;
}
public String getListClass()
{
return listClass;
}
public void setListClass(String listClass)
{
this.listClass = listClass;
}
public boolean getDefault() public boolean getDefault()
{ {
return UserConstants.YES.equals(this.isDefault) ? true : false; return UserConstants.YES.equals(this.isDefault) ? true : false;
} }
public String getIsDefault()
{
return isDefault;
}
public void setIsDefault(String isDefault)
{
this.isDefault = isDefault;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("dictCode", getDictCode())
.append("dictSort", getDictSort())
.append("dictLabel", getDictLabel())
.append("dictValue", getDictValue())
.append("dictType", getDictType())
.append("cssClass", getCssClass())
.append("listClass", getListClass())
.append("isDefault", getIsDefault())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

93
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@ -1,94 +1,69 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 字典类型表 sys_dict_type * 字典类型表 sys_dict_type
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysDictType extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
public class SysDictType
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 字典主键 */ /** 字典主键 */
@Excel(name = "字典主键", cellType = ColumnType.NUMERIC) @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
@TableId(value = "dict_id",type = IdType.AUTO)
private Long dictId; private Long dictId;
/** 字典名称 */ /** 字典名称 */
@Excel(name = "字典名称") @Excel(name = "字典名称")
@NotBlank(message = "字典名称不能为空")
@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
private String dictName; private String dictName;
/** 字典类型 */ /** 字典类型 */
@Excel(name = "字典类型") @Excel(name = "字典类型")
@NotBlank(message = "字典类型不能为空")
@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
private String dictType; private String dictType;
/** 状态（0正常 1停用） */ /** 状态（0正常 1停用） */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
public Long getDictId() /** 创建者 */
{ private String createBy;
return dictId;
}
public void setDictId(Long dictId) /** 创建时间 */
{ @TableField(fill = FieldFill.INSERT)
this.dictId = dictId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
} private Date createTime;
@NotBlank(message = "字典名称不能为空") /** 更新者 */
@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") private String updateBy;
public String getDictName()
{
return dictName;
}
public void setDictName(String dictName) /** 更新时间 */
{ @TableField(fill = FieldFill.INSERT_UPDATE)
this.dictName = dictName; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
} private Date updateTime;
@NotBlank(message = "字典类型不能为空") /** 备注 */
@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") private String remark;
public String getDictType()
{
return dictType;
}
public void setDictType(String dictType)
{
this.dictType = dictType;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("dictId", getDictId())
.append("dictName", getDictName())
.append("dictType", getDictType())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

231
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View File

@ -1,26 +1,36 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.ArrayList; import com.baomidou.mybatisplus.annotation.*;
import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.*;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 菜单权限表 sys_menu * 菜单权限表 sys_menu
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysMenu extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_menu")
public class SysMenu
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 菜单ID */ /** 菜单ID */
@TableId(value = "menu_id",type = IdType.AUTO)
private Long menuId; private Long menuId;
/** 菜单名称 */ /** 菜单名称 */
@NotBlank(message = "菜单名称不能为空")
@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
private String menuName; private String menuName;
/** 父菜单名称 */ /** 父菜单名称 */
@ -30,12 +40,15 @@ public class SysMenu extends BaseEntity
private Long parentId; private Long parentId;
/** 显示顺序 */ /** 显示顺序 */
@NotBlank(message = "显示顺序不能为空")
private String orderNum; private String orderNum;
/** 路由地址 */ /** 路由地址 */
@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
private String path; private String path;
/** 组件路径 */ /** 组件路径 */
@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
private String component; private String component;
/** 是否为外链（0是 1否） */ /** 是否为外链（0是 1否） */
@ -45,6 +58,7 @@ public class SysMenu extends BaseEntity
private String isCache; private String isCache;
/** 类型（M目录 C菜单 F按钮） */ /** 类型（M目录 C菜单 F按钮） */
@NotBlank(message = "菜单类型不能为空")
private String menuType; private String menuType;
/** 显示状态（0显示 1隐藏） */ /** 显示状态（0显示 1隐藏） */
@ -54,192 +68,37 @@ public class SysMenu extends BaseEntity
private String status; private String status;
/** 权限字符串 */ /** 权限字符串 */
@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
private String perms; private String perms;
/** 菜单图标 */ /** 菜单图标 */
private String icon; private String icon;
/** 创建者 */
private String createBy;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 备注 */
private String remark;
/** 请求参数 */
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
/** 子菜单 */ /** 子菜单 */
@TableField(exist = false)
private List<SysMenu> children = new ArrayList<SysMenu>(); private List<SysMenu> children = new ArrayList<SysMenu>();
public Long getMenuId()
{
return menuId;
}
public void setMenuId(Long menuId)
{
this.menuId = menuId;
}
@NotBlank(message = "菜单名称不能为空")
@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
public String getMenuName()
{
return menuName;
}
public void setMenuName(String menuName)
{
this.menuName = menuName;
}
public String getParentName()
{
return parentName;
}
public void setParentName(String parentName)
{
this.parentName = parentName;
}
public Long getParentId()
{
return parentId;
}
public void setParentId(Long parentId)
{
this.parentId = parentId;
}
@NotBlank(message = "显示顺序不能为空")
public String getOrderNum()
{
return orderNum;
}
public void setOrderNum(String orderNum)
{
this.orderNum = orderNum;
}
@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
public String getPath()
{
return path;
}
public void setPath(String path)
{
this.path = path;
}
@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
public String getComponent()
{
return component;
}
public void setComponent(String component)
{
this.component = component;
}
public String getIsFrame()
{
return isFrame;
}
public void setIsFrame(String isFrame)
{
this.isFrame = isFrame;
}
public String getIsCache()
{
return isCache;
}
public void setIsCache(String isCache)
{
this.isCache = isCache;
}
@NotBlank(message = "菜单类型不能为空")
public String getMenuType()
{
return menuType;
}
public void setMenuType(String menuType)
{
this.menuType = menuType;
}
public String getVisible()
{
return visible;
}
public void setVisible(String visible)
{
this.visible = visible;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
public String getPerms()
{
return perms;
}
public void setPerms(String perms)
{
this.perms = perms;
}
public String getIcon()
{
return icon;
}
public void setIcon(String icon)
{
this.icon = icon;
}
public List<SysMenu> getChildren()
{
return children;
}
public void setChildren(List<SysMenu> children)
{
this.children = children;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("menuId", getMenuId())
.append("menuName", getMenuName())
.append("parentId", getParentId())
.append("orderNum", getOrderNum())
.append("path", getPath())
.append("component", getComponent())
.append("isFrame", getIsFrame())
.append("IsCache", getIsCache())
.append("menuType", getMenuType())
.append("visible", getVisible())
.append("status ", getStatus())
.append("perms", getPerms())
.append("icon", getIcon())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

199
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@ -1,36 +1,51 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 角色表 sys_role * 角色表 sys_role
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysRole extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role")
public class SysRole
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 角色ID */ /** 角色ID */
@Excel(name = "角色序号", cellType = ColumnType.NUMERIC) @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
@TableId(value = "role_id",type = IdType.AUTO)
private Long roleId; private Long roleId;
/** 角色名称 */ /** 角色名称 */
@Excel(name = "角色名称") @Excel(name = "角色名称")
@NotBlank(message = "角色名称不能为空")
@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
private String roleName; private String roleName;
/** 角色权限 */ /** 角色权限 */
@Excel(name = "角色权限") @Excel(name = "角色权限")
@NotBlank(message = "权限字符不能为空")
@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
private String roleKey; private String roleKey;
/** 角色排序 */ /** 角色排序 */
@Excel(name = "角色排序") @Excel(name = "角色排序")
@NotBlank(message = "显示顺序不能为空")
private String roleSort; private String roleSort;
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */ /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
@ -48,37 +63,45 @@ public class SysRole extends BaseEntity
private String status; private String status;
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */
@TableLogic
private String delFlag; private String delFlag;
/** 创建者 */
private String createBy;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 备注 */
private String remark;
/** 用户是否存在此角色标识 默认不存在 */ /** 用户是否存在此角色标识 默认不存在 */
@TableField(exist = false)
private boolean flag = false; private boolean flag = false;
/** 菜单组 */ /** 菜单组 */
@TableField(exist = false)
private Long[] menuIds; private Long[] menuIds;
/** 部门组（数据权限） */ /** 部门组（数据权限） */
@TableField(exist = false)
private Long[] deptIds; private Long[] deptIds;
public SysRole()
{
}
public SysRole(Long roleId) public SysRole(Long roleId)
{ {
this.roleId = roleId; this.roleId = roleId;
} }
public Long getRoleId()
{
return roleId;
}
public void setRoleId(Long roleId)
{
this.roleId = roleId;
}
public boolean isAdmin() public boolean isAdmin()
{ {
return isAdmin(this.roleId); return isAdmin(this.roleId);
@ -89,138 +112,4 @@ public class SysRole extends BaseEntity
return roleId != null && 1L == roleId; return roleId != null && 1L == roleId;
} }
@NotBlank(message = "角色名称不能为空")
@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
public String getRoleName()
{
return roleName;
}
public void setRoleName(String roleName)
{
this.roleName = roleName;
}
@NotBlank(message = "权限字符不能为空")
@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
public String getRoleKey()
{
return roleKey;
}
public void setRoleKey(String roleKey)
{
this.roleKey = roleKey;
}
@NotBlank(message = "显示顺序不能为空")
public String getRoleSort()
{
return roleSort;
}
public void setRoleSort(String roleSort)
{
this.roleSort = roleSort;
}
public String getDataScope()
{
return dataScope;
}
public void setDataScope(String dataScope)
{
this.dataScope = dataScope;
}
public boolean isMenuCheckStrictly()
{
return menuCheckStrictly;
}
public void setMenuCheckStrictly(boolean menuCheckStrictly)
{
this.menuCheckStrictly = menuCheckStrictly;
}
public boolean isDeptCheckStrictly()
{
return deptCheckStrictly;
}
public void setDeptCheckStrictly(boolean deptCheckStrictly)
{
this.deptCheckStrictly = deptCheckStrictly;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public boolean isFlag()
{
return flag;
}
public void setFlag(boolean flag)
{
this.flag = flag;
}
public Long[] getMenuIds()
{
return menuIds;
}
public void setMenuIds(Long[] menuIds)
{
this.menuIds = menuIds;
}
public Long[] getDeptIds()
{
return deptIds;
}
public void setDeptIds(Long[] deptIds)
{
this.deptIds = deptIds;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId())
.append("roleName", getRoleName())
.append("roleKey", getRoleKey())
.append("roleSort", getRoleSort())
.append("dataScope", getDataScope())
.append("menuCheckStrictly", isMenuCheckStrictly())
.append("deptCheckStrictly", isDeptCheckStrictly())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

277
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -1,31 +1,40 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.Date; import com.baomidou.mybatisplus.annotation.*;
import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUser extends BaseEntity
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user")
public class SysUser
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 用户ID */ /** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
@TableId(value = "user_id",type = IdType.AUTO)
private Long userId; private Long userId;
/** 部门ID */ /** 部门ID */
@ -33,18 +42,24 @@ public class SysUser extends BaseEntity
private Long deptId; private Long deptId;
/** 用户账号 */ /** 用户账号 */
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
@Excel(name = "登录名称") @Excel(name = "登录名称")
private String userName; private String userName;
/** 用户昵称 */ /** 用户昵称 */
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
@Excel(name = "用户名称") @Excel(name = "用户名称")
private String nickName; private String nickName;
/** 用户邮箱 */ /** 用户邮箱 */
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
@Excel(name = "用户邮箱") @Excel(name = "用户邮箱")
private String email; private String email;
/** 手机号码 */ /** 手机号码 */
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
@Excel(name = "手机号码") @Excel(name = "手机号码")
private String phonenumber; private String phonenumber;
@ -56,6 +71,8 @@ public class SysUser extends BaseEntity
private String avatar; private String avatar;
/** 密码 */ /** 密码 */
@JsonIgnore
@JsonProperty
private String password; private String password;
/** 盐加密 */ /** 盐加密 */
@ -66,6 +83,7 @@ public class SysUser extends BaseEntity
private String status; private String status;
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */
@TableLogic
private String delFlag; private String delFlag;
/** 最后登录IP */ /** 最后登录IP */
@ -76,42 +94,50 @@ public class SysUser extends BaseEntity
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate; private Date loginDate;
/** 创建者 */
private String createBy;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 备注 */
private String remark;
/** 部门对象 */ /** 部门对象 */
@Excels({ @Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
}) })
@TableField(exist = false)
private SysDept dept; private SysDept dept;
/** 角色对象 */ /** 角色对象 */
@TableField(exist = false)
private List<SysRole> roles; private List<SysRole> roles;
/** 角色组 */ /** 角色组 */
@TableField(exist = false)
private Long[] roleIds; private Long[] roleIds;
/** 岗位组 */ /** 岗位组 */
@TableField(exist = false)
private Long[] postIds; private Long[] postIds;
public SysUser()
{
}
public SysUser(Long userId) public SysUser(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId()
{
return userId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public boolean isAdmin() public boolean isAdmin()
{ {
return isAdmin(this.userId); return isAdmin(this.userId);
@ -122,207 +148,4 @@ public class SysUser extends BaseEntity
return userId != null && 1L == userId; return userId != null && 1L == userId;
} }
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName()
{
return nickName;
}
public void setNickName(String nickName)
{
this.nickName = nickName;
}
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName()
{
return userName;
}
public void setUserName(String userName)
{
this.userName = userName;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail()
{
return email;
}
public void setEmail(String email)
{
this.email = email;
}
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
public String getPhonenumber()
{
return phonenumber;
}
public void setPhonenumber(String phonenumber)
{
this.phonenumber = phonenumber;
}
public String getSex()
{
return sex;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getAvatar()
{
return avatar;
}
public void setAvatar(String avatar)
{
this.avatar = avatar;
}
@JsonIgnore
@JsonProperty
public String getPassword()
{
return password;
}
public void setPassword(String password)
{
this.password = password;
}
public String getSalt()
{
return salt;
}
public void setSalt(String salt)
{
this.salt = salt;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getLoginIp()
{
return loginIp;
}
public void setLoginIp(String loginIp)
{
this.loginIp = loginIp;
}
public Date getLoginDate()
{
return loginDate;
}
public void setLoginDate(Date loginDate)
{
this.loginDate = loginDate;
}
public SysDept getDept()
{
return dept;
}
public void setDept(SysDept dept)
{
this.dept = dept;
}
public List<SysRole> getRoles()
{
return roles;
}
public void setRoles(List<SysRole> roles)
{
this.roles = roles;
}
public Long[] getRoleIds()
{
return roleIds;
}
public void setRoleIds(Long[] roleIds)
{
this.roleIds = roleIds;
}
public Long[] getPostIds()
{
return postIds;
}
public void setPostIds(Long[] postIds)
{
this.postIds = postIds;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
.append("phonenumber", getPhonenumber())
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
.append("salt", getSalt())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
.toString();
}
} }

147
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
View File

@ -1,111 +1,102 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringStyle; import java.util.HashMap;
import com.ruoyi.common.annotation.Excel; import java.util.Map;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 参数配置表 sys_config * 参数配置表 sys_config
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysConfig extends BaseEntity
{ @Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
public class SysConfig {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 参数主键 */ /**
* 参数主键
*/
@Excel(name = "参数主键", cellType = ColumnType.NUMERIC) @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
@TableId(value = "config_id", type = IdType.AUTO)
private Long configId; private Long configId;
/** 参数名称 */ /**
* 参数名称
*/
@Excel(name = "参数名称") @Excel(name = "参数名称")
@NotBlank(message = "参数名称不能为空")
@Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
private String configName; private String configName;
/** 参数键名 */ /**
* 参数键名
*/
@Excel(name = "参数键名") @Excel(name = "参数键名")
@NotBlank(message = "参数键名长度不能为空")
@Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
private String configKey; private String configKey;
/** 参数键值 */ /**
* 参数键值
*/
@Excel(name = "参数键值") @Excel(name = "参数键值")
@NotBlank(message = "参数键值不能为空")
@Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
private String configValue; private String configValue;
/** 系统内置（Y是 N否） */ /**
* 系统内置（Y是 N否）
*/
@Excel(name = "系统内置", readConverterExp = "Y=是,N=否") @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
private String configType; private String configType;
public Long getConfigId() /**
{ * 创建者
return configId; */
} private String createBy;
public void setConfigId(Long configId) /**
{ * 创建时间
this.configId = configId; */
} @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@NotBlank(message = "参数名称不能为空") /**
@Size(min = 0, max = 100, message = "参数名称不能超过100个字符") * 更新者
public String getConfigName() */
{ private String updateBy;
return configName;
}
public void setConfigName(String configName) /**
{ * 更新时间
this.configName = configName; */
} @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@NotBlank(message = "参数键名长度不能为空") /**
@Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") * 备注
public String getConfigKey() */
{ private String remark;
return configKey;
}
public void setConfigKey(String configKey) /**
{ * 请求参数
this.configKey = configKey; */
} @TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
@NotBlank(message = "参数键值不能为空")
@Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
public String getConfigValue()
{
return configValue;
}
public void setConfigValue(String configValue)
{
this.configValue = configValue;
}
public String getConfigType()
{
return configType;
}
public void setConfigType(String configType)
{
this.configType = configType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("configId", getConfigId())
.append("configName", getConfigName())
.append("configKey", getConfigKey())
.append("configValue", getConfigValue())
.append("configType", getConfigType())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

145
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
View File

@ -1,144 +1,83 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity; import lombok.*;
import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 系统访问记录表 sys_logininfor * 系统访问记录表 sys_logininfor
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysLogininfor extends BaseEntity
{ @Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_logininfor")
public class SysLogininfor {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** ID */ /**
* ID
*/
@Excel(name = "序号", cellType = ColumnType.NUMERIC) @Excel(name = "序号", cellType = ColumnType.NUMERIC)
@TableId(value = "info_id", type = IdType.AUTO)
private Long infoId; private Long infoId;
/** 用户账号 */ /**
* 用户账号
*/
@Excel(name = "用户账号") @Excel(name = "用户账号")
private String userName; private String userName;
/** 登录状态 0成功 1失败 */ /**
* 登录状态 0成功 1失败
*/
@Excel(name = "登录状态", readConverterExp = "0=成功,1=失败") @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
private String status; private String status;
/** 登录IP地址 */ /**
* 登录IP地址
*/
@Excel(name = "登录地址") @Excel(name = "登录地址")
private String ipaddr; private String ipaddr;
/** 登录地点 */ /**
* 登录地点
*/
@Excel(name = "登录地点") @Excel(name = "登录地点")
private String loginLocation; private String loginLocation;
/** 浏览器类型 */ /**
* 浏览器类型
*/
@Excel(name = "浏览器") @Excel(name = "浏览器")
private String browser; private String browser;
/** 操作系统 */ /**
* 操作系统
*/
@Excel(name = "操作系统") @Excel(name = "操作系统")
private String os; private String os;
/** 提示消息 */ /**
* 提示消息
*/
@Excel(name = "提示消息") @Excel(name = "提示消息")
private String msg; private String msg;
/** 访问时间 */ /**
* 访问时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date loginTime; private Date loginTime;
public Long getInfoId()
{
return infoId;
}
public void setInfoId(Long infoId)
{
this.infoId = infoId;
}
public String getUserName()
{
return userName;
}
public void setUserName(String userName)
{
this.userName = userName;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getIpaddr()
{
return ipaddr;
}
public void setIpaddr(String ipaddr)
{
this.ipaddr = ipaddr;
}
public String getLoginLocation()
{
return loginLocation;
}
public void setLoginLocation(String loginLocation)
{
this.loginLocation = loginLocation;
}
public String getBrowser()
{
return browser;
}
public void setBrowser(String browser)
{
this.browser = browser;
}
public String getOs()
{
return os;
}
public void setOs(String os)
{
this.os = os;
}
public String getMsg()
{
return msg;
}
public void setMsg(String msg)
{
this.msg = msg;
}
public Date getLoginTime()
{
return loginTime;
}
public void setLoginTime(Date loginTime)
{
this.loginTime = loginTime;
}
} }

135
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
View File

@ -1,100 +1,81 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 通知公告表 sys_notice * 通知公告表 sys_notice
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysNotice extends BaseEntity @Data
{ @NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_notice")
public class SysNotice {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 公告ID */ /**
* 公告ID
*/
@TableId(value = "notice_id", type = IdType.AUTO)
private Long noticeId; private Long noticeId;
/** 公告标题 */ /**
private String noticeTitle; * 公告标题
*/
/** 公告类型（1通知 2公告） */
private String noticeType;
/** 公告内容 */
private String noticeContent;
/** 公告状态（0正常 1关闭） */
private String status;
public Long getNoticeId()
{
return noticeId;
}
public void setNoticeId(Long noticeId)
{
this.noticeId = noticeId;
}
public void setNoticeTitle(String noticeTitle)
{
this.noticeTitle = noticeTitle;
}
@NotBlank(message = "公告标题不能为空") @NotBlank(message = "公告标题不能为空")
@Size(min = 0, max = 50, message = "公告标题不能超过50个字符") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
public String getNoticeTitle() private String noticeTitle;
{
return noticeTitle;
}
public void setNoticeType(String noticeType) /**
{ * 公告类型（1通知 2公告）
this.noticeType = noticeType; */
} private String noticeType;
public String getNoticeType() /**
{ * 公告内容
return noticeType; */
} private String noticeContent;
public void setNoticeContent(String noticeContent) /**
{ * 公告状态（0正常 1关闭）
this.noticeContent = noticeContent; */
} private String status;
public String getNoticeContent() /**
{ * 创建者
return noticeContent; */
} private String createBy;
public void setStatus(String status) /**
{ * 创建时间
this.status = status; */
} @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
public String getStatus() /**
{ * 更新者
return status; */
} private String updateBy;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 备注
*/
private String remark;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("noticeId", getNoticeId())
.append("noticeTitle", getNoticeTitle())
.append("noticeType", getNoticeType())
.append("noticeContent", getNoticeContent())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

257
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
View File

@ -1,255 +1,130 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity; import lombok.*;
import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 操作日志记录表 oper_log * 操作日志记录表 oper_log
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysOperLog extends BaseEntity
{ @Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_oper_log")
public class SysOperLog {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 日志主键 */ /**
* 日志主键
*/
@Excel(name = "操作序号", cellType = ColumnType.NUMERIC) @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
@TableId(value = "oper_id", type = IdType.AUTO)
private Long operId; private Long operId;
/** 操作模块 */ /**
* 操作模块
*/
@Excel(name = "操作模块") @Excel(name = "操作模块")
private String title; private String title;
/** 业务类型（0其它 1新增 2修改 3删除） */ /**
* 业务类型（0其它 1新增 2修改 3删除）
*/
@Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
private Integer businessType; private Integer businessType;
/** 业务类型数组 */ /**
* 业务类型数组
*/
private Integer[] businessTypes; private Integer[] businessTypes;
/** 请求方法 */ /**
* 请求方法
*/
@Excel(name = "请求方法") @Excel(name = "请求方法")
private String method; private String method;
/** 请求方式 */ /**
* 请求方式
*/
@Excel(name = "请求方式") @Excel(name = "请求方式")
private String requestMethod; private String requestMethod;
/** 操作类别（0其它 1后台用户 2手机端用户） */ /**
* 操作类别（0其它 1后台用户 2手机端用户）
*/
@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
private Integer operatorType; private Integer operatorType;
/** 操作人员 */ /**
* 操作人员
*/
@Excel(name = "操作人员") @Excel(name = "操作人员")
private String operName; private String operName;
/** 部门名称 */ /**
* 部门名称
*/
@Excel(name = "部门名称") @Excel(name = "部门名称")
private String deptName; private String deptName;
/** 请求url */ /**
* 请求url
*/
@Excel(name = "请求地址") @Excel(name = "请求地址")
private String operUrl; private String operUrl;
/** 操作地址 */ /**
* 操作地址
*/
@Excel(name = "操作地址") @Excel(name = "操作地址")
private String operIp; private String operIp;
/** 操作地点 */ /**
* 操作地点
*/
@Excel(name = "操作地点") @Excel(name = "操作地点")
private String operLocation; private String operLocation;
/** 请求参数 */ /**
* 请求参数
*/
@Excel(name = "请求参数") @Excel(name = "请求参数")
private String operParam; private String operParam;
/** 返回参数 */ /**
* 返回参数
*/
@Excel(name = "返回参数") @Excel(name = "返回参数")
private String jsonResult; private String jsonResult;
/** 操作状态（0正常 1异常） */ /**
* 操作状态（0正常 1异常）
*/
@Excel(name = "状态", readConverterExp = "0=正常,1=异常") @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
private Integer status; private Integer status;
/** 错误消息 */ /**
* 错误消息
*/
@Excel(name = "错误消息") @Excel(name = "错误消息")
private String errorMsg; private String errorMsg;
/** 操作时间 */ /**
* 操作时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operTime; private Date operTime;
public Long getOperId()
{
return operId;
}
public void setOperId(Long operId)
{
this.operId = operId;
}
public String getTitle()
{
return title;
}
public void setTitle(String title)
{
this.title = title;
}
public Integer getBusinessType()
{
return businessType;
}
public void setBusinessType(Integer businessType)
{
this.businessType = businessType;
}
public Integer[] getBusinessTypes()
{
return businessTypes;
}
public void setBusinessTypes(Integer[] businessTypes)
{
this.businessTypes = businessTypes;
}
public String getMethod()
{
return method;
}
public void setMethod(String method)
{
this.method = method;
}
public String getRequestMethod()
{
return requestMethod;
}
public void setRequestMethod(String requestMethod)
{
this.requestMethod = requestMethod;
}
public Integer getOperatorType()
{
return operatorType;
}
public void setOperatorType(Integer operatorType)
{
this.operatorType = operatorType;
}
public String getOperName()
{
return operName;
}
public void setOperName(String operName)
{
this.operName = operName;
}
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
public String getOperUrl()
{
return operUrl;
}
public void setOperUrl(String operUrl)
{
this.operUrl = operUrl;
}
public String getOperIp()
{
return operIp;
}
public void setOperIp(String operIp)
{
this.operIp = operIp;
}
public String getOperLocation()
{
return operLocation;
}
public void setOperLocation(String operLocation)
{
this.operLocation = operLocation;
}
public String getOperParam()
{
return operParam;
}
public void setOperParam(String operParam)
{
this.operParam = operParam;
}
public String getJsonResult()
{
return jsonResult;
}
public void setJsonResult(String jsonResult)
{
this.jsonResult = jsonResult;
}
public Integer getStatus()
{
return status;
}
public void setStatus(Integer status)
{
this.status = status;
}
public String getErrorMsg()
{
return errorMsg;
}
public void setErrorMsg(String errorMsg)
{
this.errorMsg = errorMsg;
}
public Date getOperTime()
{
return operTime;
}
public void setOperTime(Date operTime)
{
this.operTime = operTime;
}
} }

164
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View File

@ -1,123 +1,99 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 岗位表 sys_post * 岗位表 sys_post
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysPost extends BaseEntity
{ @Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_post")
public class SysPost {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 岗位序号 */ /**
* 岗位序号
*/
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
@TableId(value = "post_id", type = IdType.AUTO)
private Long postId; private Long postId;
/** 岗位编码 */ /**
* 岗位编码
*/
@Excel(name = "岗位编码") @Excel(name = "岗位编码")
@NotBlank(message = "岗位编码不能为空")
@Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
private String postCode; private String postCode;
/** 岗位名称 */ /**
* 岗位名称
*/
@Excel(name = "岗位名称") @Excel(name = "岗位名称")
@NotBlank(message = "岗位名称不能为空")
@Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
private String postName; private String postName;
/** 岗位排序 */ /**
* 岗位排序
*/
@Excel(name = "岗位排序") @Excel(name = "岗位排序")
@NotBlank(message = "显示顺序不能为空")
private String postSort; private String postSort;
/** 状态（0正常 1停用） */ /**
* 状态（0正常 1停用）
*/
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** 用户是否存在此岗位标识 默认不存在 */ /**
* 创建者
*/
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 更新者
*/
private String updateBy;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 备注
*/
private String remark;
/**
* 用户是否存在此岗位标识 默认不存在
*/
@TableField(exist = false)
private boolean flag = false; private boolean flag = false;
public Long getPostId()
{
return postId;
}
public void setPostId(Long postId)
{
this.postId = postId;
}
@NotBlank(message = "岗位编码不能为空")
@Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
public String getPostCode()
{
return postCode;
}
public void setPostCode(String postCode)
{
this.postCode = postCode;
}
@NotBlank(message = "岗位名称不能为空")
@Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
public String getPostName()
{
return postName;
}
public void setPostName(String postName)
{
this.postName = postName;
}
@NotBlank(message = "显示顺序不能为空")
public String getPostSort()
{
return postSort;
}
public void setPostSort(String postSort)
{
this.postSort = postSort;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public boolean isFlag()
{
return flag;
}
public void setFlag(boolean flag)
{
this.flag = flag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("postId", getPostId())
.append("postCode", getPostCode())
.append("postName", getPostName())
.append("postSort", getPostSort())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
} }

53
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
View File

@ -1,46 +1,29 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* 角色和部门关联 sys_role_dept * 角色和部门关联 sys_role_dept
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysRoleDept
{ @Data
/** 角色ID */ @NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role_dept")
public class SysRoleDept {
/**
* 角色ID
*/
private Long roleId; private Long roleId;
/** 部门ID */ /**
* 部门ID
*/
private Long deptId; private Long deptId;
public Long getRoleId()
{
return roleId;
}
public void setRoleId(Long roleId)
{
this.roleId = roleId;
}
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId())
.append("deptId", getDeptId())
.toString();
}
} }

53
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
View File

@ -1,46 +1,29 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* 角色和菜单关联 sys_role_menu * 角色和菜单关联 sys_role_menu
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysRoleMenu
{ @Data
/** 角色ID */ @NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role_menu")
public class SysRoleMenu {
/**
* 角色ID
*/
private Long roleId; private Long roleId;
/** 菜单ID */ /**
* 菜单ID
*/
private Long menuId; private Long menuId;
public Long getRoleId()
{
return roleId;
}
public void setRoleId(Long roleId)
{
this.roleId = roleId;
}
public Long getMenuId()
{
return menuId;
}
public void setMenuId(Long menuId)
{
this.menuId = menuId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId())
.append("menuId", getMenuId())
.toString();
}
} }

123
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
View File

@ -1,113 +1,56 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import lombok.*;
import lombok.experimental.Accessors;
/** /**
* 当前在线会话 * 当前在线会话
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUserOnline
{ @Data
/** 会话编号 */ @NoArgsConstructor
@Accessors(chain = true)
public class SysUserOnline {
/**
* 会话编号
*/
private String tokenId; private String tokenId;
/** 部门名称 */ /**
* 部门名称
*/
private String deptName; private String deptName;
/** 用户名称 */ /**
* 用户名称
*/
private String userName; private String userName;
/** 登录IP地址 */ /**
* 登录IP地址
*/
private String ipaddr; private String ipaddr;
/** 登录地址 */ /**
* 登录地址
*/
private String loginLocation; private String loginLocation;
/** 浏览器类型 */ /**
* 浏览器类型
*/
private String browser; private String browser;
/** 操作系统 */ /**
* 操作系统
*/
private String os; private String os;
/** 登录时间 */ /**
* 登录时间
*/
private Long loginTime; private Long loginTime;
public String getTokenId()
{
return tokenId;
}
public void setTokenId(String tokenId)
{
this.tokenId = tokenId;
}
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
public String getUserName()
{
return userName;
}
public void setUserName(String userName)
{
this.userName = userName;
}
public String getIpaddr()
{
return ipaddr;
}
public void setIpaddr(String ipaddr)
{
this.ipaddr = ipaddr;
}
public String getLoginLocation()
{
return loginLocation;
}
public void setLoginLocation(String loginLocation)
{
this.loginLocation = loginLocation;
}
public String getBrowser()
{
return browser;
}
public void setBrowser(String browser)
{
this.browser = browser;
}
public String getOs()
{
return os;
}
public void setOs(String os)
{
this.os = os;
}
public Long getLoginTime()
{
return loginTime;
}
public void setLoginTime(Long loginTime)
{
this.loginTime = loginTime;
}
} }

53
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
View File

@ -1,46 +1,29 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* 用户和岗位关联 sys_user_post * 用户和岗位关联 sys_user_post
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUserPost
{ @Data
/** 用户ID */ @NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
public class SysUserPost {
/**
* 用户ID
*/
private Long userId; private Long userId;
/** 岗位ID */ /**
* 岗位ID
*/
private Long postId; private Long postId;
public Long getUserId()
{
return userId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getPostId()
{
return postId;
}
public void setPostId(Long postId)
{
this.postId = postId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("postId", getPostId())
.toString();
}
} }

53
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
View File

@ -1,46 +1,29 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* 用户和角色关联 sys_user_role * 用户和角色关联 sys_user_role
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUserRole
{ @Data
/** 用户ID */ @NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
public class SysUserRole {
/**
* 用户ID
*/
private Long userId; private Long userId;
/** 角色ID */ /**
* 角色ID
*/
private Long roleId; private Long roleId;
public Long getUserId()
{
return userId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getRoleId()
{
return roleId;
}
public void setRoleId(Long roleId)
{
this.roleId = roleId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("roleId", getRoleId())
.toString();
}
} }

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

@ -1,12 +1,18 @@
package com.ruoyi.system.domain.vo; package com.ruoyi.system.domain.vo;
import lombok.*;
import lombok.experimental.Accessors;
/** /**
* 路由显示信息 * 路由显示信息
* *
* @author ruoyi * @author ruoyi
*/ */
public class MetaVo
{ @Data
@NoArgsConstructor
@Accessors(chain = true)
public class MetaVo {
/** /**
* 设置该路由在侧边栏和面包屑中展示的名字 * 设置该路由在侧边栏和面包屑中展示的名字
*/ */
@ -22,50 +28,15 @@ public class MetaVo
*/ */
private boolean noCache; private boolean noCache;
public MetaVo() public MetaVo(String title, String icon) {
{
}
public MetaVo(String title, String icon)
{
this.title = title; this.title = title;
this.icon = icon; this.icon = icon;
} }
public MetaVo(String title, String icon, boolean noCache) public MetaVo(String title, String icon, boolean noCache) {
{
this.title = title; this.title = title;
this.icon = icon; this.icon = icon;
this.noCache = noCache; this.noCache = noCache;
} }
public boolean isNoCache()
{
return noCache;
}
public void setNoCache(boolean noCache)
{
this.noCache = noCache;
}
public String getTitle()
{
return title;
}
public void setTitle(String title)
{
this.title = title;
}
public String getIcon()
{
return icon;
}
public void setIcon(String icon)
{
this.icon = icon;
}
} }

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

@ -1,16 +1,21 @@
package com.ruoyi.system.domain.vo; package com.ruoyi.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.*;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
/** /**
* 路由配置信息 * 路由配置信息
* *
* @author ruoyi * @author ruoyi
*/ */
@Data
@NoArgsConstructor
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouterVo public class RouterVo {
{
/** /**
* 路由名字 * 路由名字
*/ */
@ -51,83 +56,4 @@ public class RouterVo
*/ */
private List<RouterVo> children; private List<RouterVo> children;
public String getName()
{
return name;
}
public void setName(String name)
{
this.name = name;
}
public String getPath()
{
return path;
}
public void setPath(String path)
{
this.path = path;
}
public boolean getHidden()
{
return hidden;
}
public void setHidden(boolean hidden)
{
this.hidden = hidden;
}
public String getRedirect()
{
return redirect;
}
public void setRedirect(String redirect)
{
this.redirect = redirect;
}
public String getComponent()
{
return component;
}
public void setComponent(String component)
{
this.component = component;
}
public Boolean getAlwaysShow()
{
return alwaysShow;
}
public void setAlwaysShow(Boolean alwaysShow)
{
this.alwaysShow = alwaysShow;
}
public MetaVo getMeta()
{
return meta;
}
public void setMeta(MetaVo meta)
{
this.meta = meta;
}
public List<RouterVo> getChildren()
{
return children;
}
public void setChildren(List<RouterVo> children)
{
this.children = children;
}
} }

61
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
View File

@ -1,68 +1,13 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
/** /**
* 参数配置 数据层 * 参数配置 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysConfigMapper public interface SysConfigMapper extends BaseMapper<SysConfig> {
{
/**
* 查询参数配置信息
*
* @param config 参数配置信息
* @return 参数配置信息
*/
public SysConfig selectConfig(SysConfig config);
/**
* 查询参数配置列表
*
* @param config 参数配置信息
* @return 参数配置集合
*/
public List<SysConfig> selectConfigList(SysConfig config);
/**
* 根据键名查询参数配置信息
*
* @param configKey 参数键名
* @return 参数配置信息
*/
public SysConfig checkConfigKeyUnique(String configKey);
/**
* 新增参数配置
*
* @param config 参数配置信息
* @return 结果
*/
public int insertConfig(SysConfig config);
/**
* 修改参数配置
*
* @param config 参数配置信息
* @return 结果
*/
public int updateConfig(SysConfig config);
/**
* 删除参数配置
*
* @param configId 参数ID
* @return 结果
*/
public int deleteConfigById(Long configId);
/**
* 批量删除参数信息
*
* @param configIds 需要删除的参数ID
* @return 结果
*/
public int deleteConfigByIds(Long[] configIds);
} }

39
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 部门管理 数据层 * 部门管理 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysDeptMapper public interface SysDeptMapper extends BaseMapper<SysDept> {
{
/** /**
* 查询部门管理数据 * 查询部门管理数据
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 部门信息集合 * @return 部门信息集合
*/ */
@ -21,8 +22,8 @@ public interface SysDeptMapper
/** /**
* 根据角色ID查询部门树信息 * 根据角色ID查询部门树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @param deptCheckStrictly 部门树选择项是否关联显示 * @param deptCheckStrictly 部门树选择项是否关联显示
* @return 选中部门列表 * @return 选中部门列表
*/ */
@ -30,7 +31,7 @@ public interface SysDeptMapper
/** /**
* 根据部门ID查询信息 * 根据部门ID查询信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 部门信息 * @return 部门信息
*/ */
@ -38,7 +39,7 @@ public interface SysDeptMapper
/** /**
* 根据ID查询所有子部门 * 根据ID查询所有子部门
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 部门列表 * @return 部门列表
*/ */
@ -46,7 +47,7 @@ public interface SysDeptMapper
/** /**
* 根据ID查询所有子部门（正常状态） * 根据ID查询所有子部门（正常状态）
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 子部门数 * @return 子部门数
*/ */
@ -54,7 +55,7 @@ public interface SysDeptMapper
/** /**
* 是否存在子节点 * 是否存在子节点
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@ -62,7 +63,7 @@ public interface SysDeptMapper
/** /**
* 查询部门是否存在用户 * 查询部门是否存在用户
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@ -70,7 +71,7 @@ public interface SysDeptMapper
/** /**
* 校验部门名称是否唯一 * 校验部门名称是否唯一
* *
* @param deptName 部门名称 * @param deptName 部门名称
* @param parentId 父部门ID * @param parentId 父部门ID
* @return 结果 * @return 结果
@ -79,7 +80,7 @@ public interface SysDeptMapper
/** /**
* 新增部门信息 * 新增部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@ -87,7 +88,7 @@ public interface SysDeptMapper
/** /**
* 修改部门信息 * 修改部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@ -95,14 +96,14 @@ public interface SysDeptMapper
/** /**
* 修改所在部门的父级部门状态 * 修改所在部门的父级部门状态
* *
* @param dept 部门 * @param dept 部门
*/ */
public void updateDeptStatus(SysDept dept); public void updateDeptStatus(SysDept dept);
/** /**
* 修改子元素关系 * 修改子元素关系
* *
* @param depts 子元素 * @param depts 子元素
* @return 结果 * @return 结果
*/ */
@ -110,7 +111,7 @@ public interface SysDeptMapper
/** /**
* 删除部门管理信息 * 删除部门管理信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */

33
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 字典表 数据层 * 字典表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysDictDataMapper public interface SysDictDataMapper extends BaseMapper<SysDictData> {
{
/** /**
* 根据条件分页查询字典数据 * 根据条件分页查询字典数据
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@ -21,7 +22,7 @@ public interface SysDictDataMapper
/** /**
* 根据字典类型查询字典数据 * 根据字典类型查询字典数据
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@ -29,8 +30,8 @@ public interface SysDictDataMapper
/** /**
* 根据字典类型和字典键值查询字典数据信息 * 根据字典类型和字典键值查询字典数据信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @param dictValue 字典键值 * @param dictValue 字典键值
* @return 字典标签 * @return 字典标签
*/ */
@ -38,7 +39,7 @@ public interface SysDictDataMapper
/** /**
* 根据字典数据ID查询信息 * 根据字典数据ID查询信息
* *
* @param dictCode 字典数据ID * @param dictCode 字典数据ID
* @return 字典数据 * @return 字典数据
*/ */
@ -46,7 +47,7 @@ public interface SysDictDataMapper
/** /**
* 查询字典数据 * 查询字典数据
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典数据 * @return 字典数据
*/ */
@ -54,7 +55,7 @@ public interface SysDictDataMapper
/** /**
* 通过字典ID删除字典数据信息 * 通过字典ID删除字典数据信息
* *
* @param dictCode 字典数据ID * @param dictCode 字典数据ID
* @return 结果 * @return 结果
*/ */
@ -62,7 +63,7 @@ public interface SysDictDataMapper
/** /**
* 批量删除字典数据信息 * 批量删除字典数据信息
* *
* @param dictCodes 需要删除的字典数据ID * @param dictCodes 需要删除的字典数据ID
* @return 结果 * @return 结果
*/ */
@ -70,7 +71,7 @@ public interface SysDictDataMapper
/** /**
* 新增字典数据信息 * 新增字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */
@ -78,7 +79,7 @@ public interface SysDictDataMapper
/** /**
* 修改字典数据信息 * 修改字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */
@ -86,7 +87,7 @@ public interface SysDictDataMapper
/** /**
* 同步修改字典类型 * 同步修改字典类型
* *
* @param oldDictType 旧字典类型 * @param oldDictType 旧字典类型
* @param newDictType 新旧字典类型 * @param newDictType 新旧字典类型
* @return 结果 * @return 结果

29
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
View File

@ -1,20 +1,21 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 字典表 数据层 * 字典表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
@Mapper @Mapper
public interface SysDictTypeMapper public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
{
/** /**
* 根据条件分页查询字典类型 * 根据条件分页查询字典类型
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
@ -22,14 +23,14 @@ public interface SysDictTypeMapper
/** /**
* 根据所有字典类型 * 根据所有字典类型
* *
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
public List<SysDictType> selectDictTypeAll(); public List<SysDictType> selectDictTypeAll();
/** /**
* 根据字典类型ID查询信息 * 根据字典类型ID查询信息
* *
* @param dictId 字典类型ID * @param dictId 字典类型ID
* @return 字典类型 * @return 字典类型
*/ */
@ -37,7 +38,7 @@ public interface SysDictTypeMapper
/** /**
* 根据字典类型查询信息 * 根据字典类型查询信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典类型 * @return 字典类型
*/ */
@ -45,7 +46,7 @@ public interface SysDictTypeMapper
/** /**
* 通过字典ID删除字典信息 * 通过字典ID删除字典信息
* *
* @param dictId 字典ID * @param dictId 字典ID
* @return 结果 * @return 结果
*/ */
@ -53,7 +54,7 @@ public interface SysDictTypeMapper
/** /**
* 批量删除字典类型信息 * 批量删除字典类型信息
* *
* @param dictIds 需要删除的字典ID * @param dictIds 需要删除的字典ID
* @return 结果 * @return 结果
*/ */
@ -61,7 +62,7 @@ public interface SysDictTypeMapper
/** /**
* 新增字典类型信息 * 新增字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@ -69,7 +70,7 @@ public interface SysDictTypeMapper
/** /**
* 修改字典类型信息 * 修改字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@ -77,7 +78,7 @@ public interface SysDictTypeMapper
/** /**
* 校验字典类型称是否唯一 * 校验字典类型称是否唯一
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 结果 * @return 结果
*/ */

17
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
View File

@ -1,25 +1,26 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import java.util.List;
/** /**
* 系统访问日志情况信息 数据层 * 系统访问日志情况信息 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysLogininforMapper public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
{
/** /**
* 新增系统登录日志 * 新增系统登录日志
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
*/ */
public void insertLogininfor(SysLogininfor logininfor); public void insertLogininfor(SysLogininfor logininfor);
/** /**
* 查询系统登录日志集合 * 查询系统登录日志集合
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
* @return 登录记录集合 * @return 登录记录集合
*/ */
@ -27,7 +28,7 @@ public interface SysLogininforMapper
/** /**
* 批量删除系统登录日志 * 批量删除系统登录日志
* *
* @param infoIds 需要删除的登录日志ID * @param infoIds 需要删除的登录日志ID
* @return 结果 * @return 结果
*/ */
@ -35,7 +36,7 @@ public interface SysLogininforMapper
/** /**
* 清空系统登录日志 * 清空系统登录日志
* *
* @return 结果 * @return 结果
*/ */
public int cleanLogininfor(); public int cleanLogininfor();

13
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View File

@ -1,16 +1,17 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 菜单表 数据层 * 菜单表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysMenuMapper public interface SysMenuMapper extends BaseMapper<SysMenu> {
{
/** /**
* 查询系统菜单列表 * 查询系统菜单列表
* *
@ -59,8 +60,8 @@ public interface SysMenuMapper
/** /**
* 根据角色ID查询菜单树信息 * 根据角色ID查询菜单树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @param menuCheckStrictly 菜单树选择项是否关联显示 * @param menuCheckStrictly 菜单树选择项是否关联显示
* @return 选中菜单列表 * @return 选中菜单列表
*/ */

21
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import java.util.List;
/** /**
* 通知公告表 数据层 * 通知公告表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysNoticeMapper public interface SysNoticeMapper extends BaseMapper<SysNotice> {
{
/** /**
* 查询公告信息 * 查询公告信息
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 公告信息 * @return 公告信息
*/ */
@ -20,7 +21,7 @@ public interface SysNoticeMapper
/** /**
* 查询公告列表 * 查询公告列表
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 公告集合 * @return 公告集合
*/ */
@ -28,7 +29,7 @@ public interface SysNoticeMapper
/** /**
* 新增公告 * 新增公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@ -36,7 +37,7 @@ public interface SysNoticeMapper
/** /**
* 修改公告 * 修改公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@ -44,7 +45,7 @@ public interface SysNoticeMapper
/** /**
* 批量删除公告 * 批量删除公告
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 结果 * @return 结果
*/ */
@ -52,7 +53,7 @@ public interface SysNoticeMapper
/** /**
* 批量删除公告信息 * 批量删除公告信息
* *
* @param noticeIds 需要删除的公告ID * @param noticeIds 需要删除的公告ID
* @return 结果 * @return 结果
*/ */

17
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
View File

@ -1,25 +1,26 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import java.util.List;
/** /**
* 操作日志 数据层 * 操作日志 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysOperLogMapper public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
{
/** /**
* 新增操作日志 * 新增操作日志
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
*/ */
public void insertOperlog(SysOperLog operLog); public void insertOperlog(SysOperLog operLog);
/** /**
* 查询系统操作日志集合 * 查询系统操作日志集合
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
* @return 操作日志集合 * @return 操作日志集合
*/ */
@ -27,7 +28,7 @@ public interface SysOperLogMapper
/** /**
* 批量删除系统操作日志 * 批量删除系统操作日志
* *
* @param operIds 需要删除的操作日志ID * @param operIds 需要删除的操作日志ID
* @return 结果 * @return 结果
*/ */
@ -35,7 +36,7 @@ public interface SysOperLogMapper
/** /**
* 查询操作日志详细 * 查询操作日志详细
* *
* @param operId 操作ID * @param operId 操作ID
* @return 操作日志对象 * @return 操作日志对象
*/ */

31
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import java.util.List;
/** /**
* 岗位信息 数据层 * 岗位信息 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysPostMapper public interface SysPostMapper extends BaseMapper<SysPost> {
{
/** /**
* 查询岗位数据集合 * 查询岗位数据集合
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 岗位数据集合 * @return 岗位数据集合
*/ */
@ -20,14 +21,14 @@ public interface SysPostMapper
/** /**
* 查询所有岗位 * 查询所有岗位
* *
* @return 岗位列表 * @return 岗位列表
*/ */
public List<SysPost> selectPostAll(); public List<SysPost> selectPostAll();
/** /**
* 通过岗位ID查询岗位信息 * 通过岗位ID查询岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@ -35,7 +36,7 @@ public interface SysPostMapper
/** /**
* 根据用户ID获取岗位选择框列表 * 根据用户ID获取岗位选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
@ -43,7 +44,7 @@ public interface SysPostMapper
/** /**
* 查询用户所属岗位组 * 查询用户所属岗位组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@ -51,7 +52,7 @@ public interface SysPostMapper
/** /**
* 删除岗位信息 * 删除岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@ -59,7 +60,7 @@ public interface SysPostMapper
/** /**
* 批量删除岗位信息 * 批量删除岗位信息
* *
* @param postIds 需要删除的岗位ID * @param postIds 需要删除的岗位ID
* @return 结果 * @return 结果
*/ */
@ -67,7 +68,7 @@ public interface SysPostMapper
/** /**
* 修改岗位信息 * 修改岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@ -75,7 +76,7 @@ public interface SysPostMapper
/** /**
* 新增岗位信息 * 新增岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@ -83,7 +84,7 @@ public interface SysPostMapper
/** /**
* 校验岗位名称 * 校验岗位名称
* *
* @param postName 岗位名称 * @param postName 岗位名称
* @return 结果 * @return 结果
*/ */
@ -91,7 +92,7 @@ public interface SysPostMapper
/** /**
* 校验岗位编码 * 校验岗位编码
* *
* @param postCode 岗位编码 * @param postCode 岗位编码
* @return 结果 * @return 结果
*/ */

17
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleDept;
import java.util.List;
/** /**
* 角色与部门关联表 数据层 * 角色与部门关联表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysRoleDeptMapper public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
{
/** /**
* 通过角色ID删除角色和部门关联 * 通过角色ID删除角色和部门关联
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -20,7 +21,7 @@ public interface SysRoleDeptMapper
/** /**
* 批量删除角色部门关联信息 * 批量删除角色部门关联信息
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
@ -28,7 +29,7 @@ public interface SysRoleDeptMapper
/** /**
* 查询部门使用数量 * 查询部门使用数量
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@ -36,7 +37,7 @@ public interface SysRoleDeptMapper
/** /**
* 批量新增角色部门信息 * 批量新增角色部门信息
* *
* @param roleDeptList 角色部门列表 * @param roleDeptList 角色部门列表
* @return 结果 * @return 结果
*/ */

33
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import java.util.List;
/** /**
* 角色表 数据层 * 角色表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysRoleMapper public interface SysRoleMapper extends BaseMapper<SysRole> {
{
/** /**
* 根据条件分页查询角色数据 * 根据条件分页查询角色数据
* *
* @param role 角色信息 * @param role 角色信息
* @return 角色数据集合信息 * @return 角色数据集合信息
*/ */
@ -20,7 +21,7 @@ public interface SysRoleMapper
/** /**
* 根据用户ID查询角色 * 根据用户ID查询角色
* *
* @param userId 用户ID * @param userId 用户ID
* @return 角色列表 * @return 角色列表
*/ */
@ -28,14 +29,14 @@ public interface SysRoleMapper
/** /**
* 查询所有角色 * 查询所有角色
* *
* @return 角色列表 * @return 角色列表
*/ */
public List<SysRole> selectRoleAll(); public List<SysRole> selectRoleAll();
/** /**
* 根据用户ID获取角色选择框列表 * 根据用户ID获取角色选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中角色ID列表 * @return 选中角色ID列表
*/ */
@ -43,7 +44,7 @@ public interface SysRoleMapper
/** /**
* 通过角色ID查询角色 * 通过角色ID查询角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@ -51,7 +52,7 @@ public interface SysRoleMapper
/** /**
* 根据用户ID查询角色 * 根据用户ID查询角色
* *
* @param userName 用户名 * @param userName 用户名
* @return 角色列表 * @return 角色列表
*/ */
@ -59,7 +60,7 @@ public interface SysRoleMapper
/** /**
* 校验角色名称是否唯一 * 校验角色名称是否唯一
* *
* @param roleName 角色名称 * @param roleName 角色名称
* @return 角色信息 * @return 角色信息
*/ */
@ -67,7 +68,7 @@ public interface SysRoleMapper
/** /**
* 校验角色权限是否唯一 * 校验角色权限是否唯一
* *
* @param roleKey 角色权限 * @param roleKey 角色权限
* @return 角色信息 * @return 角色信息
*/ */
@ -75,7 +76,7 @@ public interface SysRoleMapper
/** /**
* 修改角色信息 * 修改角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -83,7 +84,7 @@ public interface SysRoleMapper
/** /**
* 新增角色信息 * 新增角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -91,7 +92,7 @@ public interface SysRoleMapper
/** /**
* 通过角色ID删除角色 * 通过角色ID删除角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -99,7 +100,7 @@ public interface SysRoleMapper
/** /**
* 批量删除角色信息 * 批量删除角色信息
* *
* @param roleIds 需要删除的角色ID * @param roleIds 需要删除的角色ID
* @return 结果 * @return 结果
*/ */

15
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysRoleMenu;
import java.util.List;
/** /**
* 角色与菜单关联表 数据层 * 角色与菜单关联表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysRoleMenuMapper public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
{
/** /**
* 查询菜单使用数量 * 查询菜单使用数量
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 * @return 结果
*/ */
@ -20,7 +21,7 @@ public interface SysRoleMenuMapper
/** /**
* 通过角色ID删除角色和菜单关联 * 通过角色ID删除角色和菜单关联
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -36,7 +37,7 @@ public interface SysRoleMenuMapper
/** /**
* 批量新增角色菜单信息 * 批量新增角色菜单信息
* *
* @param roleMenuList 角色菜单列表 * @param roleMenuList 角色菜单列表
* @return 结果 * @return 结果
*/ */

33
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 用户表 数据层 * 用户表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysUserMapper public interface SysUserMapper extends BaseMapper<SysUser> {
{
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
* @param sysUser 用户信息 * @param sysUser 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@ -21,7 +22,7 @@ public interface SysUserMapper
/** /**
* 通过用户名查询用户 * 通过用户名查询用户
* *
* @param userName 用户名 * @param userName 用户名
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -29,7 +30,7 @@ public interface SysUserMapper
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -37,7 +38,7 @@ public interface SysUserMapper
/** /**
* 新增用户信息 * 新增用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -45,7 +46,7 @@ public interface SysUserMapper
/** /**
* 修改用户信息 * 修改用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -53,16 +54,16 @@ public interface SysUserMapper
/** /**
* 修改用户头像 * 修改用户头像
* *
* @param userName 用户名 * @param userName 用户名
* @param avatar 头像地址 * @param avatar 头像地址
* @return 结果 * @return 结果
*/ */
public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param userName 用户名 * @param userName 用户名
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
@ -71,7 +72,7 @@ public interface SysUserMapper
/** /**
* 通过用户ID删除用户 * 通过用户ID删除用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@ -79,7 +80,7 @@ public interface SysUserMapper
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
* @return 结果 * @return 结果
*/ */
@ -87,7 +88,7 @@ public interface SysUserMapper
/** /**
* 校验用户名称是否唯一 * 校验用户名称是否唯一
* *
* @param userName 用户名称 * @param userName 用户名称
* @return 结果 * @return 结果
*/ */

17
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserPost;
import java.util.List;
/** /**
* 用户与岗位关联表 数据层 * 用户与岗位关联表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysUserPostMapper public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
{
/** /**
* 通过用户ID删除用户和岗位关联 * 通过用户ID删除用户和岗位关联
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@ -20,7 +21,7 @@ public interface SysUserPostMapper
/** /**
* 通过岗位ID查询岗位使用数量 * 通过岗位ID查询岗位使用数量
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@ -28,7 +29,7 @@ public interface SysUserPostMapper
/** /**
* 批量删除用户和岗位关联 * 批量删除用户和岗位关联
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
@ -36,7 +37,7 @@ public interface SysUserPostMapper
/** /**
* 批量新增用户岗位信息 * 批量新增用户岗位信息
* *
* @param userPostList 用户角色列表 * @param userPostList 用户角色列表
* @return 结果 * @return 结果
*/ */

25
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 用户与角色关联表 数据层 * 用户与角色关联表 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysUserRoleMapper public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
{
/** /**
* 通过用户ID删除用户和角色关联 * 通过用户ID删除用户和角色关联
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@ -21,7 +22,7 @@ public interface SysUserRoleMapper
/** /**
* 批量删除用户和角色关联 * 批量删除用户和角色关联
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
@ -29,7 +30,7 @@ public interface SysUserRoleMapper
/** /**
* 通过角色ID查询角色使用数量 * 通过角色ID查询角色使用数量
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -37,7 +38,7 @@ public interface SysUserRoleMapper
/** /**
* 批量新增用户角色信息 * 批量新增用户角色信息
* *
* @param userRoleList 用户角色列表 * @param userRoleList 用户角色列表
* @return 结果 * @return 结果
*/ */
@ -45,7 +46,7 @@ public interface SysUserRoleMapper
/** /**
* 删除用户和角色关联信息 * 删除用户和角色关联信息
* *
* @param userRole 用户和角色关联信息 * @param userRole 用户和角色关联信息
* @return 结果 * @return 结果
*/ */
@ -53,8 +54,8 @@ public interface SysUserRoleMapper
/** /**
* 批量取消授权用户角色 * 批量取消授权用户角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @param userIds 需要删除的用户数据ID * @param userIds 需要删除的用户数据ID
* @return 结果 * @return 结果
*/ */

23
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
import java.util.List;
/** /**
* 参数配置 服务层 * 参数配置 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysConfigService public interface ISysConfigService extends IService<SysConfig> {
{
/** /**
* 查询参数配置信息 * 查询参数配置信息
* *
* @param configId 参数配置ID * @param configId 参数配置ID
* @return 参数配置信息 * @return 参数配置信息
*/ */
@ -20,7 +21,7 @@ public interface ISysConfigService
/** /**
* 根据键名查询参数配置信息 * 根据键名查询参数配置信息
* *
* @param configKey 参数键名 * @param configKey 参数键名
* @return 参数键值 * @return 参数键值
*/ */
@ -28,7 +29,7 @@ public interface ISysConfigService
/** /**
* 查询参数配置列表 * 查询参数配置列表
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 参数配置集合 * @return 参数配置集合
*/ */
@ -36,7 +37,7 @@ public interface ISysConfigService
/** /**
* 新增参数配置 * 新增参数配置
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 结果 * @return 结果
*/ */
@ -44,7 +45,7 @@ public interface ISysConfigService
/** /**
* 修改参数配置 * 修改参数配置
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 结果 * @return 结果
*/ */
@ -52,7 +53,7 @@ public interface ISysConfigService
/** /**
* 批量删除参数信息 * 批量删除参数信息
* *
* @param configIds 需要删除的参数ID * @param configIds 需要删除的参数ID
* @return 结果 * @return 结果
*/ */
@ -65,7 +66,7 @@ public interface ISysConfigService
/** /**
* 校验参数键名是否唯一 * 校验参数键名是否唯一
* *
* @param config 参数信息 * @param config 参数信息
* @return 结果 * @return 结果
*/ */

33
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import java.util.List;
/** /**
* 部门管理 服务层 * 部门管理 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysDeptService public interface ISysDeptService extends IService<SysDept> {
{
/** /**
* 查询部门管理数据 * 查询部门管理数据
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 部门信息集合 * @return 部门信息集合
*/ */
@ -21,7 +22,7 @@ public interface ISysDeptService
/** /**
* 构建前端所需要树结构 * 构建前端所需要树结构
* *
* @param depts 部门列表 * @param depts 部门列表
* @return 树结构列表 * @return 树结构列表
*/ */
@ -29,7 +30,7 @@ public interface ISysDeptService
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构
* *
* @param depts 部门列表 * @param depts 部门列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
@ -37,7 +38,7 @@ public interface ISysDeptService
/** /**
* 根据角色ID查询部门树信息 * 根据角色ID查询部门树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中部门列表 * @return 选中部门列表
*/ */
@ -45,7 +46,7 @@ public interface ISysDeptService
/** /**
* 根据部门ID查询信息 * 根据部门ID查询信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 部门信息 * @return 部门信息
*/ */
@ -53,7 +54,7 @@ public interface ISysDeptService
/** /**
* 根据ID查询所有子部门（正常状态） * 根据ID查询所有子部门（正常状态）
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 子部门数 * @return 子部门数
*/ */
@ -61,7 +62,7 @@ public interface ISysDeptService
/** /**
* 是否存在部门子节点 * 是否存在部门子节点
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@ -69,7 +70,7 @@ public interface ISysDeptService
/** /**
* 查询部门是否存在用户 * 查询部门是否存在用户
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 true 存在 false 不存在 * @return 结果 true 存在 false 不存在
*/ */
@ -77,7 +78,7 @@ public interface ISysDeptService
/** /**
* 校验部门名称是否唯一 * 校验部门名称是否唯一
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@ -85,7 +86,7 @@ public interface ISysDeptService
/** /**
* 新增保存部门信息 * 新增保存部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@ -93,7 +94,7 @@ public interface ISysDeptService
/** /**
* 修改保存部门信息 * 修改保存部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@ -101,7 +102,7 @@ public interface ISysDeptService
/** /**
* 删除部门管理信息 * 删除部门管理信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */

23
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import java.util.List;
/** /**
* 字典 业务层 * 字典 业务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysDictDataService public interface ISysDictDataService extends IService<SysDictData> {
{
/** /**
* 根据条件分页查询字典数据 * 根据条件分页查询字典数据
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@ -20,8 +21,8 @@ public interface ISysDictDataService
/** /**
* 根据字典类型和字典键值查询字典数据信息 * 根据字典类型和字典键值查询字典数据信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @param dictValue 字典键值 * @param dictValue 字典键值
* @return 字典标签 * @return 字典标签
*/ */
@ -29,7 +30,7 @@ public interface ISysDictDataService
/** /**
* 根据字典数据ID查询信息 * 根据字典数据ID查询信息
* *
* @param dictCode 字典数据ID * @param dictCode 字典数据ID
* @return 字典数据 * @return 字典数据
*/ */
@ -37,7 +38,7 @@ public interface ISysDictDataService
/** /**
* 批量删除字典数据信息 * 批量删除字典数据信息
* *
* @param dictCodes 需要删除的字典数据ID * @param dictCodes 需要删除的字典数据ID
* @return 结果 * @return 结果
*/ */
@ -45,7 +46,7 @@ public interface ISysDictDataService
/** /**
* 新增保存字典数据信息 * 新增保存字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */
@ -53,7 +54,7 @@ public interface ISysDictDataService
/** /**
* 修改保存字典数据信息 * 修改保存字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */

27
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import java.util.List;
/** /**
* 字典 业务层 * 字典 业务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysDictTypeService public interface ISysDictTypeService extends IService<SysDictType> {
{
/** /**
* 根据条件分页查询字典类型 * 根据条件分页查询字典类型
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
@ -21,14 +22,14 @@ public interface ISysDictTypeService
/** /**
* 根据所有字典类型 * 根据所有字典类型
* *
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
public List<SysDictType> selectDictTypeAll(); public List<SysDictType> selectDictTypeAll();
/** /**
* 根据字典类型查询字典数据 * 根据字典类型查询字典数据
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@ -36,7 +37,7 @@ public interface ISysDictTypeService
/** /**
* 根据字典类型ID查询信息 * 根据字典类型ID查询信息
* *
* @param dictId 字典类型ID * @param dictId 字典类型ID
* @return 字典类型 * @return 字典类型
*/ */
@ -44,7 +45,7 @@ public interface ISysDictTypeService
/** /**
* 根据字典类型查询信息 * 根据字典类型查询信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典类型 * @return 字典类型
*/ */
@ -52,7 +53,7 @@ public interface ISysDictTypeService
/** /**
* 批量删除字典信息 * 批量删除字典信息
* *
* @param dictIds 需要删除的字典ID * @param dictIds 需要删除的字典ID
* @return 结果 * @return 结果
*/ */
@ -65,7 +66,7 @@ public interface ISysDictTypeService
/** /**
* 新增保存字典类型信息 * 新增保存字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@ -73,7 +74,7 @@ public interface ISysDictTypeService
/** /**
* 修改保存字典类型信息 * 修改保存字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@ -81,7 +82,7 @@ public interface ISysDictTypeService
/** /**
* 校验字典类型称是否唯一 * 校验字典类型称是否唯一
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 结果 * @return 结果
*/ */

15
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
View File

@ -1,25 +1,26 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import java.util.List;
/** /**
* 系统访问日志情况信息 服务层 * 系统访问日志情况信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysLogininforService public interface ISysLogininforService extends IService<SysLogininfor> {
{
/** /**
* 新增系统登录日志 * 新增系统登录日志
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
*/ */
public void insertLogininfor(SysLogininfor logininfor); public void insertLogininfor(SysLogininfor logininfor);
/** /**
* 查询系统登录日志集合 * 查询系统登录日志集合
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
* @return 登录记录集合 * @return 登录记录集合
*/ */
@ -27,7 +28,7 @@ public interface ISysLogininforService
/** /**
* 批量删除系统登录日志 * 批量删除系统登录日志
* *
* @param infoIds 需要删除的登录日志ID * @param infoIds 需要删除的登录日志ID
* @return * @return
*/ */

43
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View File

@ -1,21 +1,22 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Set;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.RouterVo;
import java.util.List;
import java.util.Set;
/** /**
* 菜单 业务层 * 菜单 业务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysMenuService public interface ISysMenuService extends IService<SysMenu> {
{
/** /**
* 根据用户查询系统菜单列表 * 根据用户查询系统菜单列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 菜单列表 * @return 菜单列表
*/ */
@ -23,8 +24,8 @@ public interface ISysMenuService
/** /**
* 根据用户查询系统菜单列表 * 根据用户查询系统菜单列表
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @param userId 用户ID * @param userId 用户ID
* @return 菜单列表 * @return 菜单列表
*/ */
@ -32,7 +33,7 @@ public interface ISysMenuService
/** /**
* 根据用户ID查询权限 * 根据用户ID查询权限
* *
* @param userId 用户ID * @param userId 用户ID
* @return 权限列表 * @return 权限列表
*/ */
@ -40,7 +41,7 @@ public interface ISysMenuService
/** /**
* 根据用户ID查询菜单树信息 * 根据用户ID查询菜单树信息
* *
* @param userId 用户ID * @param userId 用户ID
* @return 菜单列表 * @return 菜单列表
*/ */
@ -48,7 +49,7 @@ public interface ISysMenuService
/** /**
* 根据角色ID查询菜单树信息 * 根据角色ID查询菜单树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中菜单列表 * @return 选中菜单列表
*/ */
@ -56,7 +57,7 @@ public interface ISysMenuService
/** /**
* 构建前端路由所需要的菜单 * 构建前端路由所需要的菜单
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 路由列表 * @return 路由列表
*/ */
@ -64,7 +65,7 @@ public interface ISysMenuService
/** /**
* 构建前端所需要树结构 * 构建前端所需要树结构
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 树结构列表 * @return 树结构列表
*/ */
@ -72,7 +73,7 @@ public interface ISysMenuService
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
@ -80,7 +81,7 @@ public interface ISysMenuService
/** /**
* 根据菜单ID查询信息 * 根据菜单ID查询信息
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 菜单信息 * @return 菜单信息
*/ */
@ -88,7 +89,7 @@ public interface ISysMenuService
/** /**
* 是否存在菜单子节点 * 是否存在菜单子节点
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 true 存在 false 不存在 * @return 结果 true 存在 false 不存在
*/ */
@ -96,7 +97,7 @@ public interface ISysMenuService
/** /**
* 查询菜单是否存在角色 * 查询菜单是否存在角色
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 true 存在 false 不存在 * @return 结果 true 存在 false 不存在
*/ */
@ -104,7 +105,7 @@ public interface ISysMenuService
/** /**
* 新增保存菜单信息 * 新增保存菜单信息
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
@ -112,7 +113,7 @@ public interface ISysMenuService
/** /**
* 修改保存菜单信息 * 修改保存菜单信息
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
@ -120,7 +121,7 @@ public interface ISysMenuService
/** /**
* 删除菜单管理信息 * 删除菜单管理信息
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 * @return 结果
*/ */
@ -128,7 +129,7 @@ public interface ISysMenuService
/** /**
* 校验菜单名称是否唯一 * 校验菜单名称是否唯一
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */

23
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import java.util.List;
/** /**
* 公告 服务层 * 公告 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysNoticeService public interface ISysNoticeService extends IService<SysNotice> {
{
/** /**
* 查询公告信息 * 查询公告信息
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 公告信息 * @return 公告信息
*/ */
@ -20,7 +21,7 @@ public interface ISysNoticeService
/** /**
* 查询公告列表 * 查询公告列表
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 公告集合 * @return 公告集合
*/ */
@ -28,7 +29,7 @@ public interface ISysNoticeService
/** /**
* 新增公告 * 新增公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@ -36,7 +37,7 @@ public interface ISysNoticeService
/** /**
* 修改公告 * 修改公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@ -44,15 +45,15 @@ public interface ISysNoticeService
/** /**
* 删除公告信息 * 删除公告信息
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 结果 * @return 结果
*/ */
public int deleteNoticeById(Long noticeId); public int deleteNoticeById(Long noticeId);
/** /**
* 批量删除公告信息 * 批量删除公告信息
* *
* @param noticeIds 需要删除的公告ID * @param noticeIds 需要删除的公告ID
* @return 结果 * @return 结果
*/ */

17
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
View File

@ -1,25 +1,26 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import java.util.List;
/** /**
* 操作日志 服务层 * 操作日志 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysOperLogService public interface ISysOperLogService extends IService<SysOperLog> {
{
/** /**
* 新增操作日志 * 新增操作日志
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
*/ */
public void insertOperlog(SysOperLog operLog); public void insertOperlog(SysOperLog operLog);
/** /**
* 查询系统操作日志集合 * 查询系统操作日志集合
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
* @return 操作日志集合 * @return 操作日志集合
*/ */
@ -27,7 +28,7 @@ public interface ISysOperLogService
/** /**
* 批量删除系统操作日志 * 批量删除系统操作日志
* *
* @param operIds 需要删除的操作日志ID * @param operIds 需要删除的操作日志ID
* @return 结果 * @return 结果
*/ */
@ -35,7 +36,7 @@ public interface ISysOperLogService
/** /**
* 查询操作日志详细 * 查询操作日志详细
* *
* @param operId 操作ID * @param operId 操作ID
* @return 操作日志对象 * @return 操作日志对象
*/ */

31
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import java.util.List;
/** /**
* 岗位信息 服务层 * 岗位信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysPostService public interface ISysPostService extends IService<SysPost> {
{
/** /**
* 查询岗位信息集合 * 查询岗位信息集合
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 岗位列表 * @return 岗位列表
*/ */
@ -20,14 +21,14 @@ public interface ISysPostService
/** /**
* 查询所有岗位 * 查询所有岗位
* *
* @return 岗位列表 * @return 岗位列表
*/ */
public List<SysPost> selectPostAll(); public List<SysPost> selectPostAll();
/** /**
* 通过岗位ID查询岗位信息 * 通过岗位ID查询岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@ -35,7 +36,7 @@ public interface ISysPostService
/** /**
* 根据用户ID获取岗位选择框列表 * 根据用户ID获取岗位选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
@ -43,7 +44,7 @@ public interface ISysPostService
/** /**
* 校验岗位名称 * 校验岗位名称
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@ -51,7 +52,7 @@ public interface ISysPostService
/** /**
* 校验岗位编码 * 校验岗位编码
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@ -59,7 +60,7 @@ public interface ISysPostService
/** /**
* 通过岗位ID查询岗位使用数量 * 通过岗位ID查询岗位使用数量
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@ -67,7 +68,7 @@ public interface ISysPostService
/** /**
* 删除岗位信息 * 删除岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@ -75,7 +76,7 @@ public interface ISysPostService
/** /**
* 批量删除岗位信息 * 批量删除岗位信息
* *
* @param postIds 需要删除的岗位ID * @param postIds 需要删除的岗位ID
* @return 结果 * @return 结果
* @throws Exception 异常 * @throws Exception 异常
@ -84,7 +85,7 @@ public interface ISysPostService
/** /**
* 新增保存岗位信息 * 新增保存岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@ -92,7 +93,7 @@ public interface ISysPostService
/** /**
* 修改保存岗位信息 * 修改保存岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */

39
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysRole;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.ruoyi.common.core.domain.entity.SysRole;
/** /**
* 角色业务层 * 角色业务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysRoleService public interface ISysRoleService extends IService<SysRole> {
{
/** /**
* 根据条件分页查询角色数据 * 根据条件分页查询角色数据
* *
* @param role 角色信息 * @param role 角色信息
* @return 角色数据集合信息 * @return 角色数据集合信息
*/ */
@ -21,7 +22,7 @@ public interface ISysRoleService
/** /**
* 根据用户ID查询角色 * 根据用户ID查询角色
* *
* @param userId 用户ID * @param userId 用户ID
* @return 权限列表 * @return 权限列表
*/ */
@ -29,14 +30,14 @@ public interface ISysRoleService
/** /**
* 查询所有角色 * 查询所有角色
* *
* @return 角色列表 * @return 角色列表
*/ */
public List<SysRole> selectRoleAll(); public List<SysRole> selectRoleAll();
/** /**
* 根据用户ID获取角色选择框列表 * 根据用户ID获取角色选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中角色ID列表 * @return 选中角色ID列表
*/ */
@ -44,7 +45,7 @@ public interface ISysRoleService
/** /**
* 通过角色ID查询角色 * 通过角色ID查询角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@ -52,7 +53,7 @@ public interface ISysRoleService
/** /**
* 校验角色名称是否唯一 * 校验角色名称是否唯一
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -60,7 +61,7 @@ public interface ISysRoleService
/** /**
* 校验角色权限是否唯一 * 校验角色权限是否唯一
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -68,14 +69,14 @@ public interface ISysRoleService
/** /**
* 校验角色是否允许操作 * 校验角色是否允许操作
* *
* @param role 角色信息 * @param role 角色信息
*/ */
public void checkRoleAllowed(SysRole role); public void checkRoleAllowed(SysRole role);
/** /**
* 通过角色ID查询角色使用数量 * 通过角色ID查询角色使用数量
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -83,7 +84,7 @@ public interface ISysRoleService
/** /**
* 新增保存角色信息 * 新增保存角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -91,7 +92,7 @@ public interface ISysRoleService
/** /**
* 修改保存角色信息 * 修改保存角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -99,7 +100,7 @@ public interface ISysRoleService
/** /**
* 修改角色状态 * 修改角色状态
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -107,7 +108,7 @@ public interface ISysRoleService
/** /**
* 修改数据权限信息 * 修改数据权限信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@ -115,7 +116,7 @@ public interface ISysRoleService
/** /**
* 通过角色ID删除角色 * 通过角色ID删除角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@ -123,7 +124,7 @@ public interface ISysRoleService
/** /**
* 批量删除角色信息 * 批量删除角色信息
* *
* @param roleIds 需要删除的角色ID * @param roleIds 需要删除的角色ID
* @return 结果 * @return 结果
*/ */

21
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
View File

@ -5,42 +5,41 @@ import com.ruoyi.system.domain.SysUserOnline;
/** /**
* 在线用户 服务层 * 在线用户 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysUserOnlineService public interface ISysUserOnlineService {
{
/** /**
* 通过登录地址查询信息 * 通过登录地址查询信息
* *
* @param ipaddr 登录地址 * @param ipaddr 登录地址
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
/** /**
* 通过用户名称查询信息 * 通过用户名称查询信息
* *
* @param userName 用户名称 * @param userName 用户名称
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
/** /**
* 通过登录地址/用户名称查询信息 * 通过登录地址/用户名称查询信息
* *
* @param ipaddr 登录地址 * @param ipaddr 登录地址
* @param userName 用户名称 * @param userName 用户名称
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
/** /**
* 设置在线用户信息 * 设置在线用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 在线用户 * @return 在线用户
*/ */

49
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import java.util.List;
/** /**
* 用户 业务层 * 用户 业务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysUserService public interface ISysUserService extends IService<SysUser> {
{
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
* @param user 用户信息 * @param user 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@ -20,7 +21,7 @@ public interface ISysUserService
/** /**
* 通过用户名查询用户 * 通过用户名查询用户
* *
* @param userName 用户名 * @param userName 用户名
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -28,7 +29,7 @@ public interface ISysUserService
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -36,7 +37,7 @@ public interface ISysUserService
/** /**
* 根据用户ID查询用户所属角色组 * 根据用户ID查询用户所属角色组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@ -44,7 +45,7 @@ public interface ISysUserService
/** /**
* 根据用户ID查询用户所属岗位组 * 根据用户ID查询用户所属岗位组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@ -52,7 +53,7 @@ public interface ISysUserService
/** /**
* 校验用户名称是否唯一 * 校验用户名称是否唯一
* *
* @param userName 用户名称 * @param userName 用户名称
* @return 结果 * @return 结果
*/ */
@ -76,14 +77,14 @@ public interface ISysUserService
/** /**
* 校验用户是否允许操作 * 校验用户是否允许操作
* *
* @param user 用户信息 * @param user 用户信息
*/ */
public void checkUserAllowed(SysUser user); public void checkUserAllowed(SysUser user);
/** /**
* 新增用户信息 * 新增用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -91,7 +92,7 @@ public interface ISysUserService
/** /**
* 修改用户信息 * 修改用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -99,7 +100,7 @@ public interface ISysUserService
/** /**
* 修改用户状态 * 修改用户状态
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -107,7 +108,7 @@ public interface ISysUserService
/** /**
* 修改用户基本信息 * 修改用户基本信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -115,16 +116,16 @@ public interface ISysUserService
/** /**
* 修改用户头像 * 修改用户头像
* *
* @param userName 用户名 * @param userName 用户名
* @param avatar 头像地址 * @param avatar 头像地址
* @return 结果 * @return 结果
*/ */
public boolean updateUserAvatar(String userName, String avatar); public boolean updateUserAvatar(String userName, String avatar);
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -132,7 +133,7 @@ public interface ISysUserService
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param userName 用户名 * @param userName 用户名
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
@ -141,7 +142,7 @@ public interface ISysUserService
/** /**
* 通过用户ID删除用户 * 通过用户ID删除用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@ -149,7 +150,7 @@ public interface ISysUserService
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
* @return 结果 * @return 结果
*/ */
@ -157,10 +158,10 @@ public interface ISysUserService
/** /**
* 导入用户数据 * 导入用户数据
* *
* @param userList 用户数据列表 * @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户 * @param operName 操作用户
* @return 结果 * @return 结果
*/ */
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

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

@ -3,6 +3,8 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
@ -16,19 +18,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 参数配置 服务层实现 * 参数配置 服务层实现
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysConfigServiceImpl implements ISysConfigService public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
{
@Autowired
private SysConfigMapper configMapper;
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@ -37,49 +38,40 @@ public class SysConfigServiceImpl implements ISysConfigService
* 项目启动时，初始化参数到缓存 * 项目启动时，初始化参数到缓存
*/ */
@PostConstruct @PostConstruct
public void init() public void init() {
{ List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig()); for (SysConfig config : configsList) {
for (SysConfig config : configsList)
{
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
} }
} }
/** /**
* 查询参数配置信息 * 查询参数配置信息
* *
* @param configId 参数配置ID * @param configId 参数配置ID
* @return 参数配置信息 * @return 参数配置信息
*/ */
@Override @Override
@DataSource(DataSourceType.MASTER) @DataSource(DataSourceType.MASTER)
public SysConfig selectConfigById(Long configId) public SysConfig selectConfigById(Long configId) {
{ return baseMapper.selectById(configId);
SysConfig config = new SysConfig();
config.setConfigId(configId);
return configMapper.selectConfig(config);
} }
/** /**
* 根据键名查询参数配置信息 * 根据键名查询参数配置信息
* *
* @param configKey 参数key * @param configKey 参数key
* @return 参数键值 * @return 参数键值
*/ */
@Override @Override
public String selectConfigByKey(String configKey) public String selectConfigByKey(String configKey) {
{
String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
if (Validator.isNotEmpty(configValue)) if (Validator.isNotEmpty(configValue)) {
{
return configValue; return configValue;
} }
SysConfig config = new SysConfig(); SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
config.setConfigKey(configKey); .eq(SysConfig::getConfigKey, configKey));
SysConfig retConfig = configMapper.selectConfig(config); if (Validator.isNotNull(retConfig)) {
if (Validator.isNotNull(retConfig))
{
redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
return retConfig.getConfigValue(); return retConfig.getConfigValue();
} }
@ -88,28 +80,32 @@ public class SysConfigServiceImpl implements ISysConfigService
/** /**
* 查询参数配置列表 * 查询参数配置列表
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 参数配置集合 * @return 参数配置集合
*/ */
@Override @Override
public List<SysConfig> selectConfigList(SysConfig config) public List<SysConfig> selectConfigList(SysConfig config) {
{ LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
return configMapper.selectConfigList(config); lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
Map<String, Object> params = config.getParams();
lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
return baseMapper.selectList(lqw);
} }
/** /**
* 新增参数配置 * 新增参数配置
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertConfig(SysConfig config) public int insertConfig(SysConfig config) {
{ int row = baseMapper.insert(config);
int row = configMapper.insertConfig(config); if (row > 0) {
if (row > 0)
{
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
} }
return row; return row;
@ -117,16 +113,14 @@ public class SysConfigServiceImpl implements ISysConfigService
/** /**
* 修改参数配置 * 修改参数配置
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateConfig(SysConfig config) public int updateConfig(SysConfig config) {
{ int row = baseMapper.updateById(config);
int row = configMapper.updateConfig(config); if (row > 0) {
if (row > 0)
{
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
} }
return row; return row;
@ -134,24 +128,20 @@ public class SysConfigServiceImpl implements ISysConfigService
/** /**
* 批量删除参数信息 * 批量删除参数信息
* *
* @param configIds 需要删除的参数ID * @param configIds 需要删除的参数ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteConfigByIds(Long[] configIds) public int deleteConfigByIds(Long[] configIds) {
{ for (Long configId : configIds) {
for (Long configId : configIds)
{
SysConfig config = selectConfigById(configId); SysConfig config = selectConfigById(configId);
if (StrUtil.equals(UserConstants.YES, config.getConfigType())) if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
{
throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
} }
} }
int count = configMapper.deleteConfigByIds(configIds); int count = baseMapper.deleteBatchIds(Arrays.asList(configIds));
if (count > 0) if (count > 0) {
{
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys); redisCache.deleteObject(keys);
} }
@ -162,25 +152,22 @@ public class SysConfigServiceImpl implements ISysConfigService
* 清空缓存数据 * 清空缓存数据
*/ */
@Override @Override
public void clearCache() public void clearCache() {
{
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys); redisCache.deleteObject(keys);
} }
/** /**
* 校验参数键名是否唯一 * 校验参数键名是否唯一
* *
* @param config 参数配置信息 * @param config 参数配置信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkConfigKeyUnique(SysConfig config) public String checkConfigKeyUnique(SysConfig config) {
{
Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId(); Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -188,12 +175,11 @@ public class SysConfigServiceImpl implements ISysConfigService
/** /**
* 设置cache key * 设置cache key
* *
* @param configKey 参数键 * @param configKey 参数键
* @return 缓存键key * @return 缓存键key
*/ */
private String getCacheKey(String configKey) private String getCacheKey(String configKey) {
{
return Constants.SYS_CONFIG_KEY + configKey; return Constants.SYS_CONFIG_KEY + configKey;
} }
} }

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

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
@ -20,12 +21,11 @@ import java.util.stream.Collectors;
/** /**
* 部门管理 服务实现 * 部门管理 服务实现
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDeptServiceImpl implements ISysDeptService public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
{
@Autowired @Autowired
private SysDeptMapper deptMapper; private SysDeptMapper deptMapper;
@ -34,44 +34,38 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 查询部门管理数据 * 查询部门管理数据
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 部门信息集合 * @return 部门信息集合
*/ */
@Override @Override
@DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept) public List<SysDept> selectDeptList(SysDept dept) {
{
return deptMapper.selectDeptList(dept); return deptMapper.selectDeptList(dept);
} }
/** /**
* 构建前端所需要树结构 * 构建前端所需要树结构
* *
* @param depts 部门列表 * @param depts 部门列表
* @return 树结构列表 * @return 树结构列表
*/ */
@Override @Override
public List<SysDept> buildDeptTree(List<SysDept> depts) public List<SysDept> buildDeptTree(List<SysDept> depts) {
{
List<SysDept> returnList = new ArrayList<SysDept>(); List<SysDept> returnList = new ArrayList<SysDept>();
List<Long> tempList = new ArrayList<Long>(); List<Long> tempList = new ArrayList<Long>();
for (SysDept dept : depts) for (SysDept dept : depts) {
{
tempList.add(dept.getDeptId()); tempList.add(dept.getDeptId());
} }
for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();) for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
{
SysDept dept = (SysDept) iterator.next(); SysDept dept = (SysDept) iterator.next();
// 如果是顶级节点, 遍历该父节点的所有子节点 // 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(dept.getParentId())) if (!tempList.contains(dept.getParentId())) {
{
recursionFn(depts, dept); recursionFn(depts, dept);
returnList.add(dept); returnList.add(dept);
} }
} }
if (returnList.isEmpty()) if (returnList.isEmpty()) {
{
returnList = depts; returnList = depts;
} }
return returnList; return returnList;
@ -79,93 +73,85 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构
* *
* @param depts 部门列表 * @param depts 部门列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
@Override @Override
public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
{
List<SysDept> deptTrees = buildDeptTree(depts); List<SysDept> deptTrees = buildDeptTree(depts);
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
} }
/** /**
* 根据角色ID查询部门树信息 * 根据角色ID查询部门树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中部门列表 * @return 选中部门列表
*/ */
@Override @Override
public List<Integer> selectDeptListByRoleId(Long roleId) public List<Integer> selectDeptListByRoleId(Long roleId) {
{
SysRole role = roleMapper.selectRoleById(roleId); SysRole role = roleMapper.selectRoleById(roleId);
return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
} }
/** /**
* 根据部门ID查询信息 * 根据部门ID查询信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 部门信息 * @return 部门信息
*/ */
@Override @Override
public SysDept selectDeptById(Long deptId) public SysDept selectDeptById(Long deptId) {
{
return deptMapper.selectDeptById(deptId); return deptMapper.selectDeptById(deptId);
} }
/** /**
* 根据ID查询所有子部门（正常状态） * 根据ID查询所有子部门（正常状态）
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 子部门数 * @return 子部门数
*/ */
@Override @Override
public int selectNormalChildrenDeptById(Long deptId) public int selectNormalChildrenDeptById(Long deptId) {
{
return deptMapper.selectNormalChildrenDeptById(deptId); return deptMapper.selectNormalChildrenDeptById(deptId);
} }
/** /**
* 是否存在子节点 * 是否存在子节点
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean hasChildByDeptId(Long deptId) public boolean hasChildByDeptId(Long deptId) {
{
int result = deptMapper.hasChildByDeptId(deptId); int result = deptMapper.hasChildByDeptId(deptId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
/** /**
* 查询部门是否存在用户 * 查询部门是否存在用户
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 true 存在 false 不存在 * @return 结果 true 存在 false 不存在
*/ */
@Override @Override
public boolean checkDeptExistUser(Long deptId) public boolean checkDeptExistUser(Long deptId) {
{
int result = deptMapper.checkDeptExistUser(deptId); int result = deptMapper.checkDeptExistUser(deptId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
/** /**
* 校验部门名称是否唯一 * 校验部门名称是否唯一
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkDeptNameUnique(SysDept dept) public String checkDeptNameUnique(SysDept dept) {
{
Long deptId = Validator.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); Long deptId = Validator.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -173,17 +159,15 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 新增保存部门信息 * 新增保存部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertDept(SysDept dept) public int insertDept(SysDept dept) {
{
SysDept info = deptMapper.selectDeptById(dept.getParentId()); SysDept info = deptMapper.selectDeptById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点 // 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
{
throw new CustomException("部门停用，不允许新增"); throw new CustomException("部门停用，不允许新增");
} }
dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
@ -192,25 +176,22 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 修改保存部门信息 * 修改保存部门信息
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateDept(SysDept dept) public int updateDept(SysDept dept) {
{
SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept)) if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept)) {
{
String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
String oldAncestors = oldDept.getAncestors(); String oldAncestors = oldDept.getAncestors();
dept.setAncestors(newAncestors); dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
} }
int result = deptMapper.updateDept(dept); int result = deptMapper.updateDept(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) {
{
// 如果该部门是启用状态，则启用该部门的所有上级部门 // 如果该部门是启用状态，则启用该部门的所有上级部门
updateParentDeptStatus(dept); updateParentDeptStatus(dept);
} }
@ -219,11 +200,10 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 修改该部门的父级部门状态 * 修改该部门的父级部门状态
* *
* @param dept 当前部门 * @param dept 当前部门
*/ */
private void updateParentDeptStatus(SysDept dept) private void updateParentDeptStatus(SysDept dept) {
{
String updateBy = dept.getUpdateBy(); String updateBy = dept.getUpdateBy();
dept = deptMapper.selectDeptById(dept.getDeptId()); dept = deptMapper.selectDeptById(dept.getDeptId());
dept.setUpdateBy(updateBy); dept.setUpdateBy(updateBy);
@ -232,48 +212,41 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 修改子元素关系 * 修改子元素关系
* *
* @param deptId 被修改的部门ID * @param deptId 被修改的部门ID
* @param newAncestors 新的父ID集合 * @param newAncestors 新的父ID集合
* @param oldAncestors 旧的父ID集合 * @param oldAncestors 旧的父ID集合
*/ */
public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
{
List<SysDept> children = deptMapper.selectChildrenDeptById(deptId); List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
for (SysDept child : children) for (SysDept child : children) {
{
child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors)); child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
} }
if (children.size() > 0) if (children.size() > 0) {
{
deptMapper.updateDeptChildren(children); deptMapper.updateDeptChildren(children);
} }
} }
/** /**
* 删除部门管理信息 * 删除部门管理信息
* *
* @param deptId 部门ID * @param deptId 部门ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteDeptById(Long deptId) public int deleteDeptById(Long deptId) {
{
return deptMapper.deleteDeptById(deptId); return deptMapper.deleteDeptById(deptId);
} }
/** /**
* 递归列表 * 递归列表
*/ */
private void recursionFn(List<SysDept> list, SysDept t) private void recursionFn(List<SysDept> list, SysDept t) {
{
// 得到子节点列表 // 得到子节点列表
List<SysDept> childList = getChildList(list, t); List<SysDept> childList = getChildList(list, t);
t.setChildren(childList); t.setChildren(childList);
for (SysDept tChild : childList) for (SysDept tChild : childList) {
{ if (hasChild(list, tChild)) {
if (hasChild(list, tChild))
{
recursionFn(list, tChild); recursionFn(list, tChild);
} }
} }
@ -282,15 +255,12 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 得到子节点列表 * 得到子节点列表
*/ */
private List<SysDept> getChildList(List<SysDept> list, SysDept t) private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
{
List<SysDept> tlist = new ArrayList<SysDept>(); List<SysDept> tlist = new ArrayList<SysDept>();
Iterator<SysDept> it = list.iterator(); Iterator<SysDept> it = list.iterator();
while (it.hasNext()) while (it.hasNext()) {
{
SysDept n = (SysDept) it.next(); SysDept n = (SysDept) it.next();
if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
{
tlist.add(n); tlist.add(n);
} }
} }
@ -300,8 +270,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 判断是否有子节点 * 判断是否有子节点
*/ */
private boolean hasChild(List<SysDept> list, SysDept t) private boolean hasChild(List<SysDept> list, SysDept t) {
{
return getChildList(list, t).size() > 0 ? true : false; return getChildList(list, t).size() > 0 ? true : false;
} }
} }

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

@ -1,73 +1,69 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 字典 业务层处理 * 字典 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDictDataServiceImpl implements ISysDictDataService public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
{
@Autowired @Autowired
private SysDictDataMapper dictDataMapper; private SysDictDataMapper dictDataMapper;
/** /**
* 根据条件分页查询字典数据 * 根据条件分页查询字典数据
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@Override @Override
public List<SysDictData> selectDictDataList(SysDictData dictData) public List<SysDictData> selectDictDataList(SysDictData dictData) {
{
return dictDataMapper.selectDictDataList(dictData); return dictDataMapper.selectDictDataList(dictData);
} }
/** /**
* 根据字典类型和字典键值查询字典数据信息 * 根据字典类型和字典键值查询字典数据信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @param dictValue 字典键值 * @param dictValue 字典键值
* @return 字典标签 * @return 字典标签
*/ */
@Override @Override
public String selectDictLabel(String dictType, String dictValue) public String selectDictLabel(String dictType, String dictValue) {
{
return dictDataMapper.selectDictLabel(dictType, dictValue); return dictDataMapper.selectDictLabel(dictType, dictValue);
} }
/** /**
* 根据字典数据ID查询信息 * 根据字典数据ID查询信息
* *
* @param dictCode 字典数据ID * @param dictCode 字典数据ID
* @return 字典数据 * @return 字典数据
*/ */
@Override @Override
public SysDictData selectDictDataById(Long dictCode) public SysDictData selectDictDataById(Long dictCode) {
{
return dictDataMapper.selectDictDataById(dictCode); return dictDataMapper.selectDictDataById(dictCode);
} }
/** /**
* 批量删除字典数据信息 * 批量删除字典数据信息
* *
* @param dictCodes 需要删除的字典数据ID * @param dictCodes 需要删除的字典数据ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteDictDataByIds(Long[] dictCodes) public int deleteDictDataByIds(Long[] dictCodes) {
{
int row = dictDataMapper.deleteDictDataByIds(dictCodes); int row = dictDataMapper.deleteDictDataByIds(dictCodes);
if (row > 0) if (row > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return row; return row;
@ -75,16 +71,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/** /**
* 新增保存字典数据信息 * 新增保存字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertDictData(SysDictData dictData) public int insertDictData(SysDictData dictData) {
{
int row = dictDataMapper.insertDictData(dictData); int row = dictDataMapper.insertDictData(dictData);
if (row > 0) if (row > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return row; return row;
@ -92,16 +86,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/** /**
* 修改保存字典数据信息 * 修改保存字典数据信息
* *
* @param dictData 字典数据信息 * @param dictData 字典数据信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateDictData(SysDictData dictData) public int updateDictData(SysDictData dictData) {
{
int row = dictDataMapper.updateDictData(dictData); int row = dictDataMapper.updateDictData(dictData);
if (row > 0) if (row > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return row; return row;

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

@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
@ -19,12 +20,11 @@ import java.util.List;
/** /**
* 字典 业务层处理 * 字典 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDictTypeServiceImpl implements ISysDictTypeService public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
{
@Autowired @Autowired
private SysDictTypeMapper dictTypeMapper; private SysDictTypeMapper dictTypeMapper;
@ -35,11 +35,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
* 项目启动时，初始化字典到缓存 * 项目启动时，初始化字典到缓存
*/ */
@PostConstruct @PostConstruct
public void init() public void init() {
{
List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll(); List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
for (SysDictType dictType : dictTypeList) for (SysDictType dictType : dictTypeList) {
{
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType()); List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
DictUtils.setDictCache(dictType.getDictType(), dictDatas); DictUtils.setDictCache(dictType.getDictType(), dictDatas);
} }
@ -47,44 +45,39 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/** /**
* 根据条件分页查询字典类型 * 根据条件分页查询字典类型
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
@Override @Override
public List<SysDictType> selectDictTypeList(SysDictType dictType) public List<SysDictType> selectDictTypeList(SysDictType dictType) {
{
return dictTypeMapper.selectDictTypeList(dictType); return dictTypeMapper.selectDictTypeList(dictType);
} }
/** /**
* 根据所有字典类型 * 根据所有字典类型
* *
* @return 字典类型集合信息 * @return 字典类型集合信息
*/ */
@Override @Override
public List<SysDictType> selectDictTypeAll() public List<SysDictType> selectDictTypeAll() {
{
return dictTypeMapper.selectDictTypeAll(); return dictTypeMapper.selectDictTypeAll();
} }
/** /**
* 根据字典类型查询字典数据 * 根据字典类型查询字典数据
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典数据集合信息 * @return 字典数据集合信息
*/ */
@Override @Override
public List<SysDictData> selectDictDataByType(String dictType) public List<SysDictData> selectDictDataByType(String dictType) {
{
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType); List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
if (CollUtil.isNotEmpty(dictDatas)) if (CollUtil.isNotEmpty(dictDatas)) {
{
return dictDatas; return dictDatas;
} }
dictDatas = dictDataMapper.selectDictDataByType(dictType); dictDatas = dictDataMapper.selectDictDataByType(dictType);
if (CollUtil.isNotEmpty(dictDatas)) if (CollUtil.isNotEmpty(dictDatas)) {
{
DictUtils.setDictCache(dictType, dictDatas); DictUtils.setDictCache(dictType, dictDatas);
return dictDatas; return dictDatas;
} }
@ -93,48 +86,42 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/** /**
* 根据字典类型ID查询信息 * 根据字典类型ID查询信息
* *
* @param dictId 字典类型ID * @param dictId 字典类型ID
* @return 字典类型 * @return 字典类型
*/ */
@Override @Override
public SysDictType selectDictTypeById(Long dictId) public SysDictType selectDictTypeById(Long dictId) {
{
return dictTypeMapper.selectDictTypeById(dictId); return dictTypeMapper.selectDictTypeById(dictId);
} }
/** /**
* 根据字典类型查询信息 * 根据字典类型查询信息
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典类型 * @return 字典类型
*/ */
@Override @Override
public SysDictType selectDictTypeByType(String dictType) public SysDictType selectDictTypeByType(String dictType) {
{
return dictTypeMapper.selectDictTypeByType(dictType); return dictTypeMapper.selectDictTypeByType(dictType);
} }
/** /**
* 批量删除字典类型信息 * 批量删除字典类型信息
* *
* @param dictIds 需要删除的字典ID * @param dictIds 需要删除的字典ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteDictTypeByIds(Long[] dictIds) public int deleteDictTypeByIds(Long[] dictIds) {
{ for (Long dictId : dictIds) {
for (Long dictId : dictIds)
{
SysDictType dictType = selectDictTypeById(dictId); SysDictType dictType = selectDictTypeById(dictId);
if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) {
{
throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName())); throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
} }
} }
int count = dictTypeMapper.deleteDictTypeByIds(dictIds); int count = dictTypeMapper.deleteDictTypeByIds(dictIds);
if (count > 0) if (count > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return count; return count;
@ -144,23 +131,20 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
* 清空缓存数据 * 清空缓存数据
*/ */
@Override @Override
public void clearCache() public void clearCache() {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
/** /**
* 新增保存字典类型信息 * 新增保存字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertDictType(SysDictType dictType) public int insertDictType(SysDictType dictType) {
{
int row = dictTypeMapper.insertDictType(dictType); int row = dictTypeMapper.insertDictType(dictType);
if (row > 0) if (row > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return row; return row;
@ -168,19 +152,17 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/** /**
* 修改保存字典类型信息 * 修改保存字典类型信息
* *
* @param dictType 字典类型信息 * @param dictType 字典类型信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int updateDictType(SysDictType dictType) public int updateDictType(SysDictType dictType) {
{
SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId()); SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId());
dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType()); dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType());
int row = dictTypeMapper.updateDictType(dictType); int row = dictTypeMapper.updateDictType(dictType);
if (row > 0) if (row > 0) {
{
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
return row; return row;
@ -188,17 +170,15 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/** /**
* 校验字典类型称是否唯一 * 校验字典类型称是否唯一
* *
* @param dict 字典类型 * @param dict 字典类型
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkDictTypeUnique(SysDictType dict) public String checkDictTypeUnique(SysDictType dict) {
{
Long dictId = Validator.isNull(dict.getDictId()) ? -1L : dict.getDictId(); Long dictId = Validator.isNull(dict.getDictId()) ? -1L : dict.getDictId();
SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
if (Validator.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) if (Validator.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;

31
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
View File

@ -1,56 +1,54 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService; import com.ruoyi.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 系统访问日志情况信息 服务层处理 * 系统访问日志情况信息 服务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysLogininforServiceImpl implements ISysLogininforService public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
{
@Autowired @Autowired
private SysLogininforMapper logininforMapper; private SysLogininforMapper logininforMapper;
/** /**
* 新增系统登录日志 * 新增系统登录日志
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
*/ */
@Override @Override
public void insertLogininfor(SysLogininfor logininfor) public void insertLogininfor(SysLogininfor logininfor) {
{
logininforMapper.insertLogininfor(logininfor); logininforMapper.insertLogininfor(logininfor);
} }
/** /**
* 查询系统登录日志集合 * 查询系统登录日志集合
* *
* @param logininfor 访问日志对象 * @param logininfor 访问日志对象
* @return 登录记录集合 * @return 登录记录集合
*/ */
@Override @Override
public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
{
return logininforMapper.selectLogininforList(logininfor); return logininforMapper.selectLogininforList(logininfor);
} }
/** /**
* 批量删除系统登录日志 * 批量删除系统登录日志
* *
* @param infoIds 需要删除的登录日志ID * @param infoIds 需要删除的登录日志ID
* @return * @return
*/ */
@Override @Override
public int deleteLogininforByIds(Long[] infoIds) public int deleteLogininforByIds(Long[] infoIds) {
{
return logininforMapper.deleteLogininforByIds(infoIds); return logininforMapper.deleteLogininforByIds(infoIds);
} }
@ -58,8 +56,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService
* 清空系统登录日志 * 清空系统登录日志
*/ */
@Override @Override
public void cleanLogininfor() public void cleanLogininfor() {
{
logininforMapper.cleanLogininfor(); logininforMapper.cleanLogininfor();
} }
} }

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

@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
@ -22,12 +23,11 @@ import java.util.stream.Collectors;
/** /**
* 菜单 业务层处理 * 菜单 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysMenuServiceImpl implements ISysMenuService public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
{
public static final String PREMISSION_STRING = "perms[\"{0}\"]"; public static final String PREMISSION_STRING = "perms[\"{0}\"]";
@Autowired @Autowired
@ -41,33 +41,28 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 根据用户查询系统菜单列表 * 根据用户查询系统菜单列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 菜单列表 * @return 菜单列表
*/ */
@Override @Override
public List<SysMenu> selectMenuList(Long userId) public List<SysMenu> selectMenuList(Long userId) {
{
return selectMenuList(new SysMenu(), userId); return selectMenuList(new SysMenu(), userId);
} }
/** /**
* 查询系统菜单列表 * 查询系统菜单列表
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 菜单列表 * @return 菜单列表
*/ */
@Override @Override
public List<SysMenu> selectMenuList(SysMenu menu, Long userId) public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
{
List<SysMenu> menuList = null; List<SysMenu> menuList = null;
// 管理员显示所有菜单信息 // 管理员显示所有菜单信息
if (SysUser.isAdmin(userId)) if (SysUser.isAdmin(userId)) {
{
menuList = menuMapper.selectMenuList(menu); menuList = menuMapper.selectMenuList(menu);
} } else {
else
{
menu.getParams().put("userId", userId); menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(menu); menuList = menuMapper.selectMenuListByUserId(menu);
} }
@ -76,19 +71,16 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 根据用户ID查询权限 * 根据用户ID查询权限
* *
* @param userId 用户ID * @param userId 用户ID
* @return 权限列表 * @return 权限列表
*/ */
@Override @Override
public Set<String> selectMenuPermsByUserId(Long userId) public Set<String> selectMenuPermsByUserId(Long userId) {
{
List<String> perms = menuMapper.selectMenuPermsByUserId(userId); List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
Set<String> permsSet = new HashSet<>(); Set<String> permsSet = new HashSet<>();
for (String perm : perms) for (String perm : perms) {
{ if (Validator.isNotEmpty(perm)) {
if (Validator.isNotEmpty(perm))
{
permsSet.addAll(Arrays.asList(perm.trim().split(","))); permsSet.addAll(Arrays.asList(perm.trim().split(",")));
} }
} }
@ -97,20 +89,16 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 根据用户ID查询菜单 * 根据用户ID查询菜单
* *
* @param userId 用户名称 * @param userId 用户名称
* @return 菜单列表 * @return 菜单列表
*/ */
@Override @Override
public List<SysMenu> selectMenuTreeByUserId(Long userId) public List<SysMenu> selectMenuTreeByUserId(Long userId) {
{
List<SysMenu> menus = null; List<SysMenu> menus = null;
if (SecurityUtils.isAdmin(userId)) if (SecurityUtils.isAdmin(userId)) {
{
menus = menuMapper.selectMenuTreeAll(); menus = menuMapper.selectMenuTreeAll();
} } else {
else
{
menus = menuMapper.selectMenuTreeByUserId(userId); menus = menuMapper.selectMenuTreeByUserId(userId);
} }
return getChildPerms(menus, 0); return getChildPerms(menus, 0);
@ -118,29 +106,26 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 根据角色ID查询菜单树信息 * 根据角色ID查询菜单树信息
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中菜单列表 * @return 选中菜单列表
*/ */
@Override @Override
public List<Integer> selectMenuListByRoleId(Long roleId) public List<Integer> selectMenuListByRoleId(Long roleId) {
{
SysRole role = roleMapper.selectRoleById(roleId); SysRole role = roleMapper.selectRoleById(roleId);
return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
} }
/** /**
* 构建前端路由所需要的菜单 * 构建前端路由所需要的菜单
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 路由列表 * @return 路由列表
*/ */
@Override @Override
public List<RouterVo> buildMenus(List<SysMenu> menus) public List<RouterVo> buildMenus(List<SysMenu> menus) {
{
List<RouterVo> routers = new LinkedList<RouterVo>(); List<RouterVo> routers = new LinkedList<RouterVo>();
for (SysMenu menu : menus) for (SysMenu menu : menus) {
{
RouterVo router = new RouterVo(); RouterVo router = new RouterVo();
router.setHidden("1".equals(menu.getVisible())); router.setHidden("1".equals(menu.getVisible()));
router.setName(getRouteName(menu)); router.setName(getRouteName(menu));
@ -148,14 +133,11 @@ public class SysMenuServiceImpl implements ISysMenuService
router.setComponent(getComponent(menu)); router.setComponent(getComponent(menu));
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache()))); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
List<SysMenu> cMenus = menu.getChildren(); List<SysMenu> cMenus = menu.getChildren();
if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
{
router.setAlwaysShow(true); router.setAlwaysShow(true);
router.setRedirect("noRedirect"); router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus)); router.setChildren(buildMenus(cMenus));
} } else if (isMenuFrame(menu)) {
else if (isMenuFrame(menu))
{
List<RouterVo> childrenList = new ArrayList<RouterVo>(); List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo(); RouterVo children = new RouterVo();
children.setPath(menu.getPath()); children.setPath(menu.getPath());
@ -172,31 +154,26 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 构建前端所需要树结构 * 构建前端所需要树结构
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 树结构列表 * @return 树结构列表
*/ */
@Override @Override
public List<SysMenu> buildMenuTree(List<SysMenu> menus) public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
{
List<SysMenu> returnList = new ArrayList<SysMenu>(); List<SysMenu> returnList = new ArrayList<SysMenu>();
List<Long> tempList = new ArrayList<Long>(); List<Long> tempList = new ArrayList<Long>();
for (SysMenu dept : menus) for (SysMenu dept : menus) {
{
tempList.add(dept.getMenuId()); tempList.add(dept.getMenuId());
} }
for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();) for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
{
SysMenu menu = (SysMenu) iterator.next(); SysMenu menu = (SysMenu) iterator.next();
// 如果是顶级节点, 遍历该父节点的所有子节点 // 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(menu.getParentId())) if (!tempList.contains(menu.getParentId())) {
{
recursionFn(menus, menu); recursionFn(menus, menu);
returnList.add(menu); returnList.add(menu);
} }
} }
if (returnList.isEmpty()) if (returnList.isEmpty()) {
{
returnList = menus; returnList = menus;
} }
return returnList; return returnList;
@ -204,104 +181,95 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构
* *
* @param menus 菜单列表 * @param menus 菜单列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
@Override @Override
public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
{
List<SysMenu> menuTrees = buildMenuTree(menus); List<SysMenu> menuTrees = buildMenuTree(menus);
return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
} }
/** /**
* 根据菜单ID查询信息 * 根据菜单ID查询信息
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 菜单信息 * @return 菜单信息
*/ */
@Override @Override
public SysMenu selectMenuById(Long menuId) public SysMenu selectMenuById(Long menuId) {
{
return menuMapper.selectMenuById(menuId); return menuMapper.selectMenuById(menuId);
} }
/** /**
* 是否存在菜单子节点 * 是否存在菜单子节点
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean hasChildByMenuId(Long menuId) public boolean hasChildByMenuId(Long menuId) {
{
int result = menuMapper.hasChildByMenuId(menuId); int result = menuMapper.hasChildByMenuId(menuId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
/** /**
* 查询菜单使用数量 * 查询菜单使用数量
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean checkMenuExistRole(Long menuId) public boolean checkMenuExistRole(Long menuId) {
{
int result = roleMenuMapper.checkMenuExistRole(menuId); int result = roleMenuMapper.checkMenuExistRole(menuId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
/** /**
* 新增保存菜单信息 * 新增保存菜单信息
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertMenu(SysMenu menu) public int insertMenu(SysMenu menu) {
{
return menuMapper.insertMenu(menu); return menuMapper.insertMenu(menu);
} }
/** /**
* 修改保存菜单信息 * 修改保存菜单信息
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateMenu(SysMenu menu) public int updateMenu(SysMenu menu) {
{
return menuMapper.updateMenu(menu); return menuMapper.updateMenu(menu);
} }
/** /**
* 删除菜单管理信息 * 删除菜单管理信息
* *
* @param menuId 菜单ID * @param menuId 菜单ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteMenuById(Long menuId) public int deleteMenuById(Long menuId) {
{
return menuMapper.deleteMenuById(menuId); return menuMapper.deleteMenuById(menuId);
} }
/** /**
* 校验菜单名称是否唯一 * 校验菜单名称是否唯一
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkMenuNameUnique(SysMenu menu) public String checkMenuNameUnique(SysMenu menu) {
{
Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -309,16 +277,14 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 获取路由名称 * 获取路由名称
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 路由名称 * @return 路由名称
*/ */
public String getRouteName(SysMenu menu) public String getRouteName(SysMenu menu) {
{
String routerName = StrUtil.upperFirst(menu.getPath()); String routerName = StrUtil.upperFirst(menu.getPath());
// 非外链并且是一级目录（类型为目录） // 非外链并且是一级目录（类型为目录）
if (isMenuFrame(menu)) if (isMenuFrame(menu)) {
{
routerName = StrUtil.EMPTY; routerName = StrUtil.EMPTY;
} }
return routerName; return routerName;
@ -326,22 +292,19 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 获取路由地址 * 获取路由地址
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 路由地址 * @return 路由地址
*/ */
public String getRouterPath(SysMenu menu) public String getRouterPath(SysMenu menu) {
{
String routerPath = menu.getPath(); String routerPath = menu.getPath();
// 非外链并且是一级目录（类型为目录） // 非外链并且是一级目录（类型为目录）
if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
&& UserConstants.NO_FRAME.equals(menu.getIsFrame())) && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
{
routerPath = "/" + menu.getPath(); routerPath = "/" + menu.getPath();
} }
// 非外链并且是一级目录（类型为菜单） // 非外链并且是一级目录（类型为菜单）
else if (isMenuFrame(menu)) else if (isMenuFrame(menu)) {
{
routerPath = "/"; routerPath = "/";
} }
return routerPath; return routerPath;
@ -349,19 +312,15 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 获取组件信息 * 获取组件信息
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 组件信息 * @return 组件信息
*/ */
public String getComponent(SysMenu menu) public String getComponent(SysMenu menu) {
{
String component = UserConstants.LAYOUT; String component = UserConstants.LAYOUT;
if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
{
component = menu.getComponent(); component = menu.getComponent();
} } else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu)) {
else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu))
{
component = UserConstants.PARENT_VIEW; component = UserConstants.PARENT_VIEW;
} }
return component; return component;
@ -369,43 +328,38 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 是否为菜单内部跳转 * 是否为菜单内部跳转
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
public boolean isMenuFrame(SysMenu menu) public boolean isMenuFrame(SysMenu menu) {
{
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
&& menu.getIsFrame().equals(UserConstants.NO_FRAME); && menu.getIsFrame().equals(UserConstants.NO_FRAME);
} }
/** /**
* 是否为parent_view组件 * 是否为parent_view组件
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
public boolean isParentView(SysMenu menu) public boolean isParentView(SysMenu menu) {
{
return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
} }
/** /**
* 根据父节点的ID获取所有子节点 * 根据父节点的ID获取所有子节点
* *
* @param list 分类表 * @param list 分类表
* @param parentId 传入的父节点ID * @param parentId 传入的父节点ID
* @return String * @return String
*/ */
public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
{
List<SysMenu> returnList = new ArrayList<SysMenu>(); List<SysMenu> returnList = new ArrayList<SysMenu>();
for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();) for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
{
SysMenu t = (SysMenu) iterator.next(); SysMenu t = (SysMenu) iterator.next();
// 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
if (t.getParentId() == parentId) if (t.getParentId() == parentId) {
{
recursionFn(list, t); recursionFn(list, t);
returnList.add(t); returnList.add(t);
} }
@ -415,19 +369,16 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 递归列表 * 递归列表
* *
* @param list * @param list
* @param t * @param t
*/ */
private void recursionFn(List<SysMenu> list, SysMenu t) private void recursionFn(List<SysMenu> list, SysMenu t) {
{
// 得到子节点列表 // 得到子节点列表
List<SysMenu> childList = getChildList(list, t); List<SysMenu> childList = getChildList(list, t);
t.setChildren(childList); t.setChildren(childList);
for (SysMenu tChild : childList) for (SysMenu tChild : childList) {
{ if (hasChild(list, tChild)) {
if (hasChild(list, tChild))
{
recursionFn(list, tChild); recursionFn(list, tChild);
} }
} }
@ -436,15 +387,12 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 得到子节点列表 * 得到子节点列表
*/ */
private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
{
List<SysMenu> tlist = new ArrayList<SysMenu>(); List<SysMenu> tlist = new ArrayList<SysMenu>();
Iterator<SysMenu> it = list.iterator(); Iterator<SysMenu> it = list.iterator();
while (it.hasNext()) while (it.hasNext()) {
{
SysMenu n = (SysMenu) it.next(); SysMenu n = (SysMenu) it.next();
if (n.getParentId().longValue() == t.getMenuId().longValue()) if (n.getParentId().longValue() == t.getMenuId().longValue()) {
{
tlist.add(n); tlist.add(n);
} }
} }
@ -454,8 +402,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 判断是否有子节点 * 判断是否有子节点
*/ */
private boolean hasChild(List<SysMenu> list, SysMenu t) private boolean hasChild(List<SysMenu> list, SysMenu t) {
{
return getChildList(list, t).size() > 0 ? true : false; return getChildList(list, t).size() > 0 ? true : false;
} }
} }

37
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
@ -9,84 +11,77 @@ import com.ruoyi.system.service.ISysNoticeService;
/** /**
* 公告 服务层实现 * 公告 服务层实现
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysNoticeServiceImpl implements ISysNoticeService public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
{
@Autowired @Autowired
private SysNoticeMapper noticeMapper; private SysNoticeMapper noticeMapper;
/** /**
* 查询公告信息 * 查询公告信息
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 公告信息 * @return 公告信息
*/ */
@Override @Override
public SysNotice selectNoticeById(Long noticeId) public SysNotice selectNoticeById(Long noticeId) {
{
return noticeMapper.selectNoticeById(noticeId); return noticeMapper.selectNoticeById(noticeId);
} }
/** /**
* 查询公告列表 * 查询公告列表
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 公告集合 * @return 公告集合
*/ */
@Override @Override
public List<SysNotice> selectNoticeList(SysNotice notice) public List<SysNotice> selectNoticeList(SysNotice notice) {
{
return noticeMapper.selectNoticeList(notice); return noticeMapper.selectNoticeList(notice);
} }
/** /**
* 新增公告 * 新增公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertNotice(SysNotice notice) public int insertNotice(SysNotice notice) {
{
return noticeMapper.insertNotice(notice); return noticeMapper.insertNotice(notice);
} }
/** /**
* 修改公告 * 修改公告
* *
* @param notice 公告信息 * @param notice 公告信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateNotice(SysNotice notice) public int updateNotice(SysNotice notice) {
{
return noticeMapper.updateNotice(notice); return noticeMapper.updateNotice(notice);
} }
/** /**
* 删除公告对象 * 删除公告对象
* *
* @param noticeId 公告ID * @param noticeId 公告ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteNoticeById(Long noticeId) public int deleteNoticeById(Long noticeId) {
{
return noticeMapper.deleteNoticeById(noticeId); return noticeMapper.deleteNoticeById(noticeId);
} }
/** /**
* 批量删除公告信息 * 批量删除公告信息
* *
* @param noticeIds 需要删除的公告ID * @param noticeIds 需要删除的公告ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteNoticeByIds(Long[] noticeIds) public int deleteNoticeByIds(Long[] noticeIds) {
{
return noticeMapper.deleteNoticeByIds(noticeIds); return noticeMapper.deleteNoticeByIds(noticeIds);
} }
} }

30
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
@ -9,59 +11,54 @@ import com.ruoyi.system.service.ISysOperLogService;
/** /**
* 操作日志 服务层处理 * 操作日志 服务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysOperLogServiceImpl implements ISysOperLogService public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
{
@Autowired @Autowired
private SysOperLogMapper operLogMapper; private SysOperLogMapper operLogMapper;
/** /**
* 新增操作日志 * 新增操作日志
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
*/ */
@Override @Override
public void insertOperlog(SysOperLog operLog) public void insertOperlog(SysOperLog operLog) {
{
operLogMapper.insertOperlog(operLog); operLogMapper.insertOperlog(operLog);
} }
/** /**
* 查询系统操作日志集合 * 查询系统操作日志集合
* *
* @param operLog 操作日志对象 * @param operLog 操作日志对象
* @return 操作日志集合 * @return 操作日志集合
*/ */
@Override @Override
public List<SysOperLog> selectOperLogList(SysOperLog operLog) public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
{
return operLogMapper.selectOperLogList(operLog); return operLogMapper.selectOperLogList(operLog);
} }
/** /**
* 批量删除系统操作日志 * 批量删除系统操作日志
* *
* @param operIds 需要删除的操作日志ID * @param operIds 需要删除的操作日志ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteOperLogByIds(Long[] operIds) public int deleteOperLogByIds(Long[] operIds) {
{
return operLogMapper.deleteOperLogByIds(operIds); return operLogMapper.deleteOperLogByIds(operIds);
} }
/** /**
* 查询操作日志详细 * 查询操作日志详细
* *
* @param operId 操作ID * @param operId 操作ID
* @return 操作日志对象 * @return 操作日志对象
*/ */
@Override @Override
public SysOperLog selectOperLogById(Long operId) public SysOperLog selectOperLogById(Long operId) {
{
return operLogMapper.selectOperLogById(operId); return operLogMapper.selectOperLogById(operId);
} }
@ -69,8 +66,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService
* 清空操作日志 * 清空操作日志
*/ */
@Override @Override
public void cleanOperLog() public void cleanOperLog() {
{
operLogMapper.cleanOperLog(); operLogMapper.cleanOperLog();
} }
} }

73
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
@ -14,12 +15,11 @@ import java.util.List;
/** /**
* 岗位信息 服务层处理 * 岗位信息 服务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysPostServiceImpl implements ISysPostService public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements ISysPostService {
{
@Autowired @Autowired
private SysPostMapper postMapper; private SysPostMapper postMapper;
@ -28,64 +28,58 @@ public class SysPostServiceImpl implements ISysPostService
/** /**
* 查询岗位信息集合 * 查询岗位信息集合
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 岗位信息集合 * @return 岗位信息集合
*/ */
@Override @Override
public List<SysPost> selectPostList(SysPost post) public List<SysPost> selectPostList(SysPost post) {
{
return postMapper.selectPostList(post); return postMapper.selectPostList(post);
} }
/** /**
* 查询所有岗位 * 查询所有岗位
* *
* @return 岗位列表 * @return 岗位列表
*/ */
@Override @Override
public List<SysPost> selectPostAll() public List<SysPost> selectPostAll() {
{
return postMapper.selectPostAll(); return postMapper.selectPostAll();
} }
/** /**
* 通过岗位ID查询岗位信息 * 通过岗位ID查询岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@Override @Override
public SysPost selectPostById(Long postId) public SysPost selectPostById(Long postId) {
{
return postMapper.selectPostById(postId); return postMapper.selectPostById(postId);
} }
/** /**
* 根据用户ID获取岗位选择框列表 * 根据用户ID获取岗位选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
@Override @Override
public List<Integer> selectPostListByUserId(Long userId) public List<Integer> selectPostListByUserId(Long userId) {
{
return postMapper.selectPostListByUserId(userId); return postMapper.selectPostListByUserId(userId);
} }
/** /**
* 校验岗位名称是否唯一 * 校验岗位名称是否唯一
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkPostNameUnique(SysPost post) public String checkPostNameUnique(SysPost post) {
{
Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId(); Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
SysPost info = postMapper.checkPostNameUnique(post.getPostName()); SysPost info = postMapper.checkPostNameUnique(post.getPostName());
if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -93,17 +87,15 @@ public class SysPostServiceImpl implements ISysPostService
/** /**
* 校验岗位编码是否唯一 * 校验岗位编码是否唯一
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkPostCodeUnique(SysPost post) public String checkPostCodeUnique(SysPost post) {
{
Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId(); Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -111,43 +103,38 @@ public class SysPostServiceImpl implements ISysPostService
/** /**
* 通过岗位ID查询岗位使用数量 * 通过岗位ID查询岗位使用数量
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int countUserPostById(Long postId) public int countUserPostById(Long postId) {
{
return userPostMapper.countUserPostById(postId); return userPostMapper.countUserPostById(postId);
} }
/** /**
* 删除岗位信息 * 删除岗位信息
* *
* @param postId 岗位ID * @param postId 岗位ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deletePostById(Long postId) public int deletePostById(Long postId) {
{
return postMapper.deletePostById(postId); return postMapper.deletePostById(postId);
} }
/** /**
* 批量删除岗位信息 * 批量删除岗位信息
* *
* @param postIds 需要删除的岗位ID * @param postIds 需要删除的岗位ID
* @return 结果 * @return 结果
* @throws Exception 异常 * @throws Exception 异常
*/ */
@Override @Override
public int deletePostByIds(Long[] postIds) public int deletePostByIds(Long[] postIds) {
{ for (Long postId : postIds) {
for (Long postId : postIds)
{
SysPost post = selectPostById(postId); SysPost post = selectPostById(postId);
if (countUserPostById(postId) > 0) if (countUserPostById(postId) > 0) {
{
throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName())); throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
} }
} }
@ -156,25 +143,23 @@ public class SysPostServiceImpl implements ISysPostService
/** /**
* 新增保存岗位信息 * 新增保存岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertPost(SysPost post) public int insertPost(SysPost post) {
{
return postMapper.insertPost(post); return postMapper.insertPost(post);
} }
/** /**
* 修改保存岗位信息 * 修改保存岗位信息
* *
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updatePost(SysPost post) public int updatePost(SysPost post) {
{
return postMapper.updatePost(post); return postMapper.updatePost(post);
} }
} }

122
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
@ -21,12 +22,11 @@ import java.util.*;
/** /**
* 角色 业务层处理 * 角色 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysRoleServiceImpl implements ISysRoleService public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
{
@Autowired @Autowired
private SysRoleMapper roleMapper; private SysRoleMapper roleMapper;
@ -41,32 +41,28 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 根据条件分页查询角色数据 * 根据条件分页查询角色数据
* *
* @param role 角色信息 * @param role 角色信息
* @return 角色数据集合信息 * @return 角色数据集合信息
*/ */
@Override @Override
@DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) public List<SysRole> selectRoleList(SysRole role) {
{
return roleMapper.selectRoleList(role); return roleMapper.selectRoleList(role);
} }
/** /**
* 根据用户ID查询权限 * 根据用户ID查询权限
* *
* @param userId 用户ID * @param userId 用户ID
* @return 权限列表 * @return 权限列表
*/ */
@Override @Override
public Set<String> selectRolePermissionByUserId(Long userId) public Set<String> selectRolePermissionByUserId(Long userId) {
{
List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId); List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
Set<String> permsSet = new HashSet<>(); Set<String> permsSet = new HashSet<>();
for (SysRole perm : perms) for (SysRole perm : perms) {
{ if (Validator.isNotNull(perm)) {
if (Validator.isNotNull(perm))
{
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
} }
} }
@ -75,52 +71,47 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 查询所有角色 * 查询所有角色
* *
* @return 角色列表 * @return 角色列表
*/ */
@Override @Override
public List<SysRole> selectRoleAll() public List<SysRole> selectRoleAll() {
{
return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
} }
/** /**
* 根据用户ID获取角色选择框列表 * 根据用户ID获取角色选择框列表
* *
* @param userId 用户ID * @param userId 用户ID
* @return 选中角色ID列表 * @return 选中角色ID列表
*/ */
@Override @Override
public List<Integer> selectRoleListByUserId(Long userId) public List<Integer> selectRoleListByUserId(Long userId) {
{
return roleMapper.selectRoleListByUserId(userId); return roleMapper.selectRoleListByUserId(userId);
} }
/** /**
* 通过角色ID查询角色 * 通过角色ID查询角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
@Override @Override
public SysRole selectRoleById(Long roleId) public SysRole selectRoleById(Long roleId) {
{
return roleMapper.selectRoleById(roleId); return roleMapper.selectRoleById(roleId);
} }
/** /**
* 校验角色名称是否唯一 * 校验角色名称是否唯一
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkRoleNameUnique(SysRole role) public String checkRoleNameUnique(SysRole role) {
{
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId(); Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -128,17 +119,15 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 校验角色权限是否唯一 * 校验角色权限是否唯一
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkRoleKeyUnique(SysRole role) public String checkRoleKeyUnique(SysRole role) {
{
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId(); Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -146,40 +135,36 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 校验角色是否允许操作 * 校验角色是否允许操作
* *
* @param role 角色信息 * @param role 角色信息
*/ */
@Override @Override
public void checkRoleAllowed(SysRole role) public void checkRoleAllowed(SysRole role) {
{ if (Validator.isNotNull(role.getRoleId()) && role.isAdmin()) {
if (Validator.isNotNull(role.getRoleId()) && role.isAdmin())
{
throw new CustomException("不允许操作超级管理员角色"); throw new CustomException("不允许操作超级管理员角色");
} }
} }
/** /**
* 通过角色ID查询角色使用数量 * 通过角色ID查询角色使用数量
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int countUserRoleByRoleId(Long roleId) public int countUserRoleByRoleId(Long roleId) {
{
return userRoleMapper.countUserRoleByRoleId(roleId); return userRoleMapper.countUserRoleByRoleId(roleId);
} }
/** /**
* 新增保存角色信息 * 新增保存角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int insertRole(SysRole role) public int insertRole(SysRole role) {
{
// 新增角色信息 // 新增角色信息
roleMapper.insertRole(role); roleMapper.insertRole(role);
return insertRoleMenu(role); return insertRoleMenu(role);
@ -187,14 +172,13 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 修改保存角色信息 * 修改保存角色信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int updateRole(SysRole role) public int updateRole(SysRole role) {
{
// 修改角色信息 // 修改角色信息
roleMapper.updateRole(role); roleMapper.updateRole(role);
// 删除角色与菜单关联 // 删除角色与菜单关联
@ -204,26 +188,24 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 修改角色状态 * 修改角色状态
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateRoleStatus(SysRole role) public int updateRoleStatus(SysRole role) {
{
return roleMapper.updateRole(role); return roleMapper.updateRole(role);
} }
/** /**
* 修改数据权限信息 * 修改数据权限信息
* *
* @param role 角色信息 * @param role 角色信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int authDataScope(SysRole role) public int authDataScope(SysRole role) {
{
// 修改角色信息 // 修改角色信息
roleMapper.updateRole(role); roleMapper.updateRole(role);
// 删除角色与部门关联 // 删除角色与部门关联
@ -234,23 +216,20 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 新增角色菜单信息 * 新增角色菜单信息
* *
* @param role 角色对象 * @param role 角色对象
*/ */
public int insertRoleMenu(SysRole role) public int insertRoleMenu(SysRole role) {
{
int rows = 1; int rows = 1;
// 新增用户与角色管理 // 新增用户与角色管理
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>(); List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
for (Long menuId : role.getMenuIds()) for (Long menuId : role.getMenuIds()) {
{
SysRoleMenu rm = new SysRoleMenu(); SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(role.getRoleId()); rm.setRoleId(role.getRoleId());
rm.setMenuId(menuId); rm.setMenuId(menuId);
list.add(rm); list.add(rm);
} }
if (list.size() > 0) if (list.size() > 0) {
{
rows = roleMenuMapper.batchRoleMenu(list); rows = roleMenuMapper.batchRoleMenu(list);
} }
return rows; return rows;
@ -261,20 +240,17 @@ public class SysRoleServiceImpl implements ISysRoleService
* *
* @param role 角色对象 * @param role 角色对象
*/ */
public int insertRoleDept(SysRole role) public int insertRoleDept(SysRole role) {
{
int rows = 1; int rows = 1;
// 新增角色与部门（数据权限）管理 // 新增角色与部门（数据权限）管理
List<SysRoleDept> list = new ArrayList<SysRoleDept>(); List<SysRoleDept> list = new ArrayList<SysRoleDept>();
for (Long deptId : role.getDeptIds()) for (Long deptId : role.getDeptIds()) {
{
SysRoleDept rd = new SysRoleDept(); SysRoleDept rd = new SysRoleDept();
rd.setRoleId(role.getRoleId()); rd.setRoleId(role.getRoleId());
rd.setDeptId(deptId); rd.setDeptId(deptId);
list.add(rd); list.add(rd);
} }
if (list.size() > 0) if (list.size() > 0) {
{
rows = roleDeptMapper.batchRoleDept(list); rows = roleDeptMapper.batchRoleDept(list);
} }
return rows; return rows;
@ -282,14 +258,13 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 通过角色ID删除角色 * 通过角色ID删除角色
* *
* @param roleId 角色ID * @param roleId 角色ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteRoleById(Long roleId) public int deleteRoleById(Long roleId) {
{
// 删除角色与菜单关联 // 删除角色与菜单关联
roleMenuMapper.deleteRoleMenuByRoleId(roleId); roleMenuMapper.deleteRoleMenuByRoleId(roleId);
// 删除角色与部门关联 // 删除角色与部门关联
@ -299,20 +274,17 @@ public class SysRoleServiceImpl implements ISysRoleService
/** /**
* 批量删除角色信息 * 批量删除角色信息
* *
* @param roleIds 需要删除的角色ID * @param roleIds 需要删除的角色ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteRoleByIds(Long[] roleIds) public int deleteRoleByIds(Long[] roleIds) {
{ for (Long roleId : roleIds) {
for (Long roleId : roleIds)
{
checkRoleAllowed(new SysRole(roleId)); checkRoleAllowed(new SysRole(roleId));
SysRole role = selectRoleById(roleId); SysRole role = selectRoleById(roleId);
if (countUserRoleByRoleId(roleId) > 0) if (countUserRoleByRoleId(roleId) > 0) {
{
throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName())); throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));
} }
} }

48
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -9,24 +9,21 @@ import org.springframework.stereotype.Service;
/** /**
* 在线用户 服务层处理 * 在线用户 服务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
{
/** /**
* 通过登录地址查询信息 * 通过登录地址查询信息
* *
* @param ipaddr 登录地址 * @param ipaddr 登录地址
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
@Override @Override
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) {
{ if (StrUtil.equals(ipaddr, user.getIpaddr())) {
if (StrUtil.equals(ipaddr, user.getIpaddr()))
{
return loginUserToUserOnline(user); return loginUserToUserOnline(user);
} }
return null; return null;
@ -34,16 +31,14 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/** /**
* 通过用户名称查询信息 * 通过用户名称查询信息
* *
* @param userName 用户名称 * @param userName 用户名称
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
@Override @Override
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) {
{ if (StrUtil.equals(userName, user.getUsername())) {
if (StrUtil.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user); return loginUserToUserOnline(user);
} }
return null; return null;
@ -51,17 +46,15 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/** /**
* 通过登录地址/用户名称查询信息 * 通过登录地址/用户名称查询信息
* *
* @param ipaddr 登录地址 * @param ipaddr 登录地址
* @param userName 用户名称 * @param userName 用户名称
* @param user 用户信息 * @param user 用户信息
* @return 在线用户信息 * @return 在线用户信息
*/ */
@Override @Override
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) {
{ if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername())) {
if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user); return loginUserToUserOnline(user);
} }
return null; return null;
@ -69,15 +62,13 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/** /**
* 设置在线用户信息 * 设置在线用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 在线用户 * @return 在线用户
*/ */
@Override @Override
public SysUserOnline loginUserToUserOnline(LoginUser user) public SysUserOnline loginUserToUserOnline(LoginUser user) {
{ if (Validator.isNull(user) || Validator.isNull(user.getUser())) {
if (Validator.isNull(user) || Validator.isNull(user.getUser()))
{
return null; return null;
} }
SysUserOnline sysUserOnline = new SysUserOnline(); SysUserOnline sysUserOnline = new SysUserOnline();
@ -88,8 +79,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
sysUserOnline.setBrowser(user.getBrowser()); sysUserOnline.setBrowser(user.getBrowser());
sysUserOnline.setOs(user.getOs()); sysUserOnline.setOs(user.getOs());
sysUserOnline.setLoginTime(user.getLoginTime()); sysUserOnline.setLoginTime(user.getLoginTime());
if (Validator.isNotNull(user.getUser().getDept())) if (Validator.isNotNull(user.getUser().getDept())) {
{
sysUserOnline.setDeptName(user.getUser().getDept().getDeptName()); sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
} }
return sysUserOnline; return sysUserOnline;

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

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
@ -24,12 +25,11 @@ import java.util.List;
/** /**
* 用户 业务层处理 * 用户 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysUserServiceImpl implements ISysUserService public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
{
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired @Autowired
@ -52,58 +52,52 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
* @param user 用户信息 * @param user 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@Override @Override
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user) public List<SysUser> selectUserList(SysUser user) {
{
return userMapper.selectUserList(user); return userMapper.selectUserList(user);
} }
/** /**
* 通过用户名查询用户 * 通过用户名查询用户
* *
* @param userName 用户名 * @param userName 用户名
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserByUserName(String userName) public SysUser selectUserByUserName(String userName) {
{
return userMapper.selectUserByUserName(userName); return userMapper.selectUserByUserName(userName);
} }
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserById(Long userId) public SysUser selectUserById(Long userId) {
{
return userMapper.selectUserById(userId); return userMapper.selectUserById(userId);
} }
/** /**
* 查询用户所属角色组 * 查询用户所属角色组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserRoleGroup(String userName) public String selectUserRoleGroup(String userName) {
{
List<SysRole> list = roleMapper.selectRolesByUserName(userName); List<SysRole> list = roleMapper.selectRolesByUserName(userName);
StringBuffer idsStr = new StringBuffer(); StringBuffer idsStr = new StringBuffer();
for (SysRole role : list) for (SysRole role : list) {
{
idsStr.append(role.getRoleName()).append(","); idsStr.append(role.getRoleName()).append(",");
} }
if (Validator.isNotEmpty(idsStr.toString())) if (Validator.isNotEmpty(idsStr.toString())) {
{
return idsStr.substring(0, idsStr.length() - 1); return idsStr.substring(0, idsStr.length() - 1);
} }
return idsStr.toString(); return idsStr.toString();
@ -111,21 +105,18 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 查询用户所属岗位组 * 查询用户所属岗位组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserPostGroup(String userName) public String selectUserPostGroup(String userName) {
{
List<SysPost> list = postMapper.selectPostsByUserName(userName); List<SysPost> list = postMapper.selectPostsByUserName(userName);
StringBuffer idsStr = new StringBuffer(); StringBuffer idsStr = new StringBuffer();
for (SysPost post : list) for (SysPost post : list) {
{
idsStr.append(post.getPostName()).append(","); idsStr.append(post.getPostName()).append(",");
} }
if (Validator.isNotEmpty(idsStr.toString())) if (Validator.isNotEmpty(idsStr.toString())) {
{
return idsStr.substring(0, idsStr.length() - 1); return idsStr.substring(0, idsStr.length() - 1);
} }
return idsStr.toString(); return idsStr.toString();
@ -133,16 +124,14 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 校验用户名称是否唯一 * 校验用户名称是否唯一
* *
* @param userName 用户名称 * @param userName 用户名称
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkUserNameUnique(String userName) public String checkUserNameUnique(String userName) {
{
int count = userMapper.checkUserNameUnique(userName); int count = userMapper.checkUserNameUnique(userName);
if (count > 0) if (count > 0) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -155,12 +144,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return * @return
*/ */
@Override @Override
public String checkPhoneUnique(SysUser user) public String checkPhoneUnique(SysUser user) {
{
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -173,12 +160,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return * @return
*/ */
@Override @Override
public String checkEmailUnique(SysUser user) public String checkEmailUnique(SysUser user) {
{
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail()); SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -186,28 +171,25 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 校验用户是否允许操作 * 校验用户是否允许操作
* *
* @param user 用户信息 * @param user 用户信息
*/ */
@Override @Override
public void checkUserAllowed(SysUser user) public void checkUserAllowed(SysUser user) {
{ if (Validator.isNotNull(user.getUserId()) && user.isAdmin()) {
if (Validator.isNotNull(user.getUserId()) && user.isAdmin())
{
throw new CustomException("不允许操作超级管理员用户"); throw new CustomException("不允许操作超级管理员用户");
} }
} }
/** /**
* 新增保存用户信息 * 新增保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int insertUser(SysUser user) public int insertUser(SysUser user) {
{
// 新增用户信息 // 新增用户信息
int rows = userMapper.insertUser(user); int rows = userMapper.insertUser(user);
// 新增用户岗位关联 // 新增用户岗位关联
@ -219,14 +201,13 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改保存用户信息 * 修改保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int updateUser(SysUser user) public int updateUser(SysUser user) {
{
Long userId = user.getUserId(); Long userId = user.getUserId();
// 删除用户与角色关联 // 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
@ -241,87 +222,78 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改用户状态 * 修改用户状态
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserStatus(SysUser user) public int updateUserStatus(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 修改用户基本信息 * 修改用户基本信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserProfile(SysUser user) public int updateUserProfile(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 修改用户头像 * 修改用户头像
* *
* @param userName 用户名 * @param userName 用户名
* @param avatar 头像地址 * @param avatar 头像地址
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean updateUserAvatar(String userName, String avatar) public boolean updateUserAvatar(String userName, String avatar) {
{
return userMapper.updateUserAvatar(userName, avatar) > 0; return userMapper.updateUserAvatar(userName, avatar) > 0;
} }
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetPwd(SysUser user) public int resetPwd(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param userName 用户名 * @param userName 用户名
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetUserPwd(String userName, String password) public int resetUserPwd(String userName, String password) {
{
return userMapper.resetUserPwd(userName, password); return userMapper.resetUserPwd(userName, password);
} }
/** /**
* 新增用户角色信息 * 新增用户角色信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserRole(SysUser user) public void insertUserRole(SysUser user) {
{
Long[] roles = user.getRoleIds(); Long[] roles = user.getRoleIds();
if (Validator.isNotNull(roles)) if (Validator.isNotNull(roles)) {
{
// 新增用户与角色管理 // 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>(); List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roles) for (Long roleId : roles) {
{
SysUserRole ur = new SysUserRole(); SysUserRole ur = new SysUserRole();
ur.setUserId(user.getUserId()); ur.setUserId(user.getUserId());
ur.setRoleId(roleId); ur.setRoleId(roleId);
list.add(ur); list.add(ur);
} }
if (list.size() > 0) if (list.size() > 0) {
{
userRoleMapper.batchUserRole(list); userRoleMapper.batchUserRole(list);
} }
} }
@ -329,25 +301,21 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 新增用户岗位信息 * 新增用户岗位信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserPost(SysUser user) public void insertUserPost(SysUser user) {
{
Long[] posts = user.getPostIds(); Long[] posts = user.getPostIds();
if (Validator.isNotNull(posts)) if (Validator.isNotNull(posts)) {
{
// 新增用户与岗位管理 // 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>(); List<SysUserPost> list = new ArrayList<SysUserPost>();
for (Long postId : posts) for (Long postId : posts) {
{
SysUserPost up = new SysUserPost(); SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId()); up.setUserId(user.getUserId());
up.setPostId(postId); up.setPostId(postId);
list.add(up); list.add(up);
} }
if (list.size() > 0) if (list.size() > 0) {
{
userPostMapper.batchUserPost(list); userPostMapper.batchUserPost(list);
} }
} }
@ -355,14 +323,13 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 通过用户ID删除用户 * 通过用户ID删除用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserById(Long userId) public int deleteUserById(Long userId) {
{
// 删除用户与角色关联 // 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表 // 删除用户与岗位表
@ -372,16 +339,14 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserByIds(Long[] userIds) public int deleteUserByIds(Long[] userIds) {
{ for (Long userId : userIds) {
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId)); checkUserAllowed(new SysUser(userId));
} }
// 删除用户与角色关联 // 删除用户与角色关联
@ -393,17 +358,15 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 导入用户数据 * 导入用户数据
* *
* @param userList 用户数据列表 * @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户 * @param operName 操作用户
* @return 结果 * @return 结果
*/ */
@Override @Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
{ if (Validator.isNull(userList) || userList.size() == 0) {
if (Validator.isNull(userList) || userList.size() == 0)
{
throw new CustomException("导入用户数据不能为空！"); throw new CustomException("导入用户数据不能为空！");
} }
int successNum = 0; int successNum = 0;
@ -411,48 +374,36 @@ public class SysUserServiceImpl implements ISysUserService
StringBuilder successMsg = new StringBuilder(); StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword"); String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList) for (SysUser user : userList) {
{ try {
try
{
// 验证是否存在这个用户 // 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName()); SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (Validator.isNull(u)) if (Validator.isNull(u)) {
{
user.setPassword(SecurityUtils.encryptPassword(password)); user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName); user.setCreateBy(operName);
this.insertUser(user); this.insertUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
} } else if (isUpdateSupport) {
else if (isUpdateSupport)
{
user.setUpdateBy(operName); user.setUpdateBy(operName);
this.updateUser(user); this.updateUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
} } else {
else
{
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在"); failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
} }
} } catch (Exception e) {
catch (Exception e)
{
failureNum++; failureNum++;
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
failureMsg.append(msg + e.getMessage()); failureMsg.append(msg + e.getMessage());
log.error(msg, e); log.error(msg, e);
} }
} }
if (failureNum > 0) if (failureNum > 0) {
{
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new CustomException(failureMsg.toString()); throw new CustomException(failureMsg.toString());
} } else {
else
{
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
} }
return successMsg.toString(); return successMsg.toString();

119
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
View File

@ -1,112 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper"> <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult"> <resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" /> <id property="configId" column="config_id"/>
<result property="configName" column="config_name" /> <result property="configName" column="config_name"/>
<result property="configKey" column="config_key" /> <result property="configKey" column="config_key"/>
<result property="configValue" column="config_value" /> <result property="configValue" column="config_value"/>
<result property="configType" column="config_type" /> <result property="configType" column="config_type"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectConfigVo">
select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
from sys_config
</sql>
<!-- 查询条件 -->
<sql id="sqlwhereSearch">
<where>
<if test="configId !=null">
and config_id = #{configId}
</if>
<if test="configKey !=null and configKey != ''">
and config_key = #{configKey}
</if>
</where>
</sql>
<select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
<select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
<if test="configName != null and configName != ''">
AND config_name like concat('%', #{configName}, '%')
</if>
<if test="configType != null and configType != ''">
AND config_type = #{configType}
</if>
<if test="configKey != null and configKey != ''">
AND config_key like concat('%', #{configKey}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
<select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
where config_key = #{configKey} limit 1
</select>
<insert id="insertConfig" parameterType="SysConfig">
insert into sys_config (
<if test="configName != null and configName != '' ">config_name,</if>
<if test="configKey != null and configKey != '' ">config_key,</if>
<if test="configValue != null and configValue != '' ">config_value,</if>
<if test="configType != null and configType != '' ">config_type,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
)values(
<if test="configName != null and configName != ''">#{configName},</if>
<if test="configKey != null and configKey != ''">#{configKey},</if>
<if test="configValue != null and configValue != ''">#{configValue},</if>
<if test="configType != null and configType != ''">#{configType},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
sysdate()
)
</insert>
<update id="updateConfig" parameterType="SysConfig">
update sys_config
<set>
<if test="configName != null and configName != ''">config_name = #{configName},</if>
<if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
<if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
<if test="configType != null and configType != ''">config_type = #{configType},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = sysdate()
</set>
where config_id = #{configId}
</update>
<delete id="deleteConfigById" parameterType="Long">
delete from sys_config where config_id = #{configId}
</delete>
<delete id="deleteConfigByIds" parameterType="Long">
delete from sys_config where config_id in
<foreach item="configId" collection="array" open="(" separator="," close=")">
#{configId}
</foreach>
</delete>
</mapper> </mapper>

303
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -1,157 +1,182 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult"> <resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" /> <id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id"/>
<result property="ancestors" column="ancestors" /> <result property="ancestors" column="ancestors"/>
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name"/>
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num"/>
<result property="leader" column="leader" /> <result property="leader" column="leader"/>
<result property="phone" column="phone" /> <result property="phone" column="phone"/>
<result property="email" column="email" /> <result property="email" column="email"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag"/>
<result property="parentName" column="parent_name" /> <result property="parentName" column="parent_name"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectDeptVo"> <sql id="selectDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time select d.dept_id,
d.parent_id,
d.ancestors,
d.dept_name,
d.order_num,
d.leader,
d.phone,
d.email,
d.status,
d.del_flag,
d.create_by,
d.create_time
from sys_dept d from sys_dept d
</sql> </sql>
<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
where d.del_flag = '0' where d.del_flag = '0'
<if test="parentId != null and parentId != 0"> <if test="parentId != null and parentId != 0">
AND parent_id = #{parentId} AND parent_id = #{parentId}
</if> </if>
<if test="deptName != null and deptName != ''"> <if test="deptName != null and deptName != ''">
AND dept_name like concat('%', #{deptName}, '%') AND dept_name like concat('%', #{deptName}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status = #{status} AND status = #{status}
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
order by d.parent_id, d.order_num order by d.parent_id, d.order_num
</select> </select>
<select id="selectDeptListByRoleId" resultType="Integer"> <select id="selectDeptListByRoleId" resultType="Integer">
select d.dept_id select d.dept_id
from sys_dept d from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId} where rd.role_id = #{roleId}
<if test="deptCheckStrictly"> <if test="deptCheckStrictly">
and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
</if> rd.dept_id and rd.role_id = #{roleId})
order by d.parent_id, d.order_num </if>
</select> order by d.parent_id, d.order_num
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult"> <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
where dept_id = #{deptId} where dept_id = #{deptId}
</select> </select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int"> <select id="checkDeptExistUser" parameterType="Long" resultType="int">
select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0' select count(1)
</select> from sys_user
where dept_id = #{deptId}
<select id="hasChildByDeptId" parameterType="Long" resultType="int"> and del_flag = '0'
select count(1) from sys_dept </select>
where del_flag = '0' and parent_id = #{deptId} limit 1
</select> <select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1)
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult"> from sys_dept
select * from sys_dept where find_in_set(#{deptId}, ancestors) where del_flag = '0'
</select> and parent_id = #{deptId} limit 1
</select>
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors) <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
</select> select *
from sys_dept
<select id="checkDeptNameUnique" resultMap="SysDeptResult"> where find_in_set(#{deptId}, ancestors)
<include refid="selectDeptVo"/> </select>
where dept_name=#{deptName} and parent_id = #{parentId} limit 1
</select> <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*)
from sys_dept
where status = 0
and del_flag = '0'
and find_in_set(#{deptId}, ancestors)
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_name=#{deptName} and parent_id = #{parentId} limit 1
</select>
<insert id="insertDept" parameterType="SysDept"> <insert id="insertDept" parameterType="SysDept">
insert into sys_dept( insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> <if test="parentId != null and parentId != 0">parent_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if> <if test="deptName != null and deptName != ''">dept_name,</if>
<if test="ancestors != null and ancestors != ''">ancestors,</if> <if test="ancestors != null and ancestors != ''">ancestors,</if>
<if test="orderNum != null and orderNum != ''">order_num,</if> <if test="orderNum != null and orderNum != ''">order_num,</if>
<if test="leader != null and leader != ''">leader,</if> <if test="leader != null and leader != ''">leader,</if>
<if test="phone != null and phone != ''">phone,</if> <if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if> <if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)values( )values(
<if test="deptId != null and deptId != 0">#{deptId},</if> <if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="parentId != null and parentId != 0">#{parentId},</if> <if test="parentId != null and parentId != 0">#{parentId},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if> <if test="deptName != null and deptName != ''">#{deptName},</if>
<if test="ancestors != null and ancestors != ''">#{ancestors},</if> <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
<if test="orderNum != null and orderNum != ''">#{orderNum},</if> <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
<if test="leader != null and leader != ''">#{leader},</if> <if test="leader != null and leader != ''">#{leader},</if>
<if test="phone != null and phone != ''">#{phone},</if> <if test="phone != null and phone != ''">#{phone},</if>
<if test="email != null and email != ''">#{email},</if> <if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate() sysdate()
) )
</insert> </insert>
<update id="updateDept" parameterType="SysDept"> <update id="updateDept" parameterType="SysDept">
update sys_dept update sys_dept
<set> <set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if> <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if> <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if> <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if> <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
<if test="leader != null">leader = #{leader},</if> <if test="leader != null">leader = #{leader},</if>
<if test="phone != null">phone = #{phone},</if> <if test="phone != null">phone = #{phone},</if>
<if test="email != null">email = #{email},</if> <if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if> <if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate() update_time = sysdate()
</set>
where dept_id = #{deptId}
</update>
<update id="updateDeptChildren" parameterType="java.util.List">
update sys_dept set ancestors =
<foreach collection="depts" item="item" index="index"
separator=" " open="case dept_id" close="end">
when #{item.deptId} then #{item.ancestors}
</foreach>
where dept_id in
<foreach collection="depts" item="item" index="index"
separator="," open="(" close=")">
#{item.deptId}
</foreach>
</update>
<update id="updateDeptStatus" parameterType="SysDept">
update sys_dept
<set>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set> </set>
where dept_id in (${ancestors}) where dept_id = #{deptId}
</update> </update>
<delete id="deleteDeptById" parameterType="Long"> <update id="updateDeptChildren" parameterType="java.util.List">
update sys_dept set del_flag = '2' where dept_id = #{deptId} update sys_dept set ancestors =
</delete> <foreach collection="depts" item="item" index="index"
separator=" " open="case dept_id" close="end">
when #{item.deptId} then #{item.ancestors}
</foreach>
where dept_id in
<foreach collection="depts" item="item" index="index"
separator="," open="(" close=")">
#{item.deptId}
</foreach>
</update>
<update id="updateDeptStatus" parameterType="SysDept">
update sys_dept
<set>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where dept_id in (${ancestors})
</update>
<delete id="deleteDeptById" parameterType="Long">
update sys_dept
set del_flag = '2'
where dept_id = #{deptId}
</delete>
</mapper> </mapper>

255
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
View File

@ -1,124 +1,143 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult"> <resultMap type="SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" /> <id property="dictCode" column="dict_code"/>
<result property="dictSort" column="dict_sort" /> <result property="dictSort" column="dict_sort"/>
<result property="dictLabel" column="dict_label" /> <result property="dictLabel" column="dict_label"/>
<result property="dictValue" column="dict_value" /> <result property="dictValue" column="dict_value"/>
<result property="dictType" column="dict_type" /> <result property="dictType" column="dict_type"/>
<result property="cssClass" column="css_class" /> <result property="cssClass" column="css_class"/>
<result property="listClass" column="list_class" /> <result property="listClass" column="list_class"/>
<result property="isDefault" column="is_default" /> <result property="isDefault" column="is_default"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectDictDataVo"> <sql id="selectDictDataVo">
select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark select dict_code,
from sys_dict_data dict_sort,
dict_label,
dict_value,
dict_type,
css_class,
list_class,
is_default,
status,
create_by,
create_time,
remark
from sys_dict_data
</sql> </sql>
<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult"> <select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/> <include refid="selectDictDataVo"/>
<where> <where>
<if test="dictType != null and dictType != ''"> <if test="dictType != null and dictType != ''">
AND dict_type = #{dictType} AND dict_type = #{dictType}
</if> </if>
<if test="dictLabel != null and dictLabel != ''"> <if test="dictLabel != null and dictLabel != ''">
AND dict_label like concat('%', #{dictLabel}, '%') AND dict_label like concat('%', #{dictLabel}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status = #{status} AND status = #{status}
</if> </if>
</where> </where>
order by dict_sort asc order by dict_sort asc
</select> </select>
<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult"> <select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/> <include refid="selectDictDataVo"/>
where status = '0' and dict_type = #{dictType} order by dict_sort asc where status = '0' and dict_type = #{dictType} order by dict_sort asc
</select> </select>
<select id="selectDictLabel" resultType="String"> <select id="selectDictLabel" resultType="String">
select dict_label from sys_dict_data select dict_label
where dict_type = #{dictType} and dict_value = #{dictValue} from sys_dict_data
</select> where dict_type = #{dictType}
and dict_value = #{dictValue}
<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult"> </select>
<include refid="selectDictDataVo"/>
where dict_code = #{dictCode} <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
</select> <include refid="selectDictDataVo"/>
where dict_code = #{dictCode}
<select id="countDictDataByType" resultType="Integer"> </select>
select count(1) from sys_dict_data where dict_type=#{dictType}
</select> <select id="countDictDataByType" resultType="Integer">
select count(1)
<delete id="deleteDictDataById" parameterType="Long"> from sys_dict_data
delete from sys_dict_data where dict_code = #{dictCode} where dict_type = #{dictType}
</delete> </select>
<delete id="deleteDictDataByIds" parameterType="Long"> <delete id="deleteDictDataById" parameterType="Long">
delete from sys_dict_data where dict_code in delete
<foreach collection="array" item="dictCode" open="(" separator="," close=")"> from sys_dict_data
#{dictCode} where dict_code = #{dictCode}
</foreach> </delete>
</delete>
<delete id="deleteDictDataByIds" parameterType="Long">
<update id="updateDictData" parameterType="SysDictData"> delete from sys_dict_data where dict_code in
update sys_dict_data <foreach collection="array" item="dictCode" open="(" separator="," close=")">
<set> #{dictCode}
<if test="dictSort != null">dict_sort = #{dictSort},</if> </foreach>
<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if> </delete>
<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if> <update id="updateDictData" parameterType="SysDictData">
<if test="cssClass != null">css_class = #{cssClass},</if> update sys_dict_data
<if test="listClass != null">list_class = #{listClass},</if> <set>
<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if> <if test="dictSort != null">dict_sort = #{dictSort},</if>
<if test="status != null">status = #{status},</if> <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
<if test="remark != null">remark = #{remark},</if> <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
update_time = sysdate() <if test="cssClass != null">css_class = #{cssClass},</if>
</set> <if test="listClass != null">list_class = #{listClass},</if>
where dict_code = #{dictCode} <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
</update> <if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<update id="updateDictDataType" parameterType="String"> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} update_time = sysdate()
</update> </set>
where dict_code = #{dictCode}
<insert id="insertDictData" parameterType="SysDictData"> </update>
insert into sys_dict_data(
<if test="dictSort != null">dict_sort,</if> <update id="updateDictDataType" parameterType="String">
<if test="dictLabel != null and dictLabel != ''">dict_label,</if> update sys_dict_data
<if test="dictValue != null and dictValue != ''">dict_value,</if> set dict_type = #{newDictType}
<if test="dictType != null and dictType != ''">dict_type,</if> where dict_type = #{oldDictType}
<if test="cssClass != null and cssClass != ''">css_class,</if> </update>
<if test="listClass != null and listClass != ''">list_class,</if>
<if test="isDefault != null and isDefault != ''">is_default,</if> <insert id="insertDictData" parameterType="SysDictData">
<if test="status != null">status,</if> insert into sys_dict_data(
<if test="remark != null and remark != ''">remark,</if> <if test="dictSort != null">dict_sort,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="dictLabel != null and dictLabel != ''">dict_label,</if>
create_time <if test="dictValue != null and dictValue != ''">dict_value,</if>
)values( <if test="dictType != null and dictType != ''">dict_type,</if>
<if test="dictSort != null">#{dictSort},</if> <if test="cssClass != null and cssClass != ''">css_class,</if>
<if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if> <if test="listClass != null and listClass != ''">list_class,</if>
<if test="dictValue != null and dictValue != ''">#{dictValue},</if> <if test="isDefault != null and isDefault != ''">is_default,</if>
<if test="dictType != null and dictType != ''">#{dictType},</if> <if test="status != null">status,</if>
<if test="cssClass != null and cssClass != ''">#{cssClass},</if> <if test="remark != null and remark != ''">remark,</if>
<if test="listClass != null and listClass != ''">#{listClass},</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="isDefault != null and isDefault != ''">#{isDefault},</if> create_time
<if test="status != null">#{status},</if> )values(
<if test="remark != null and remark != ''">#{remark},</if> <if test="dictSort != null">#{dictSort},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
sysdate() <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
) <if test="dictType != null and dictType != ''">#{dictType},</if>
</insert> <if test="cssClass != null and cssClass != ''">#{cssClass},</if>
<if test="listClass != null and listClass != ''">#{listClass},</if>
<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
<if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
</mapper> </mapper>

196
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View File

@ -1,105 +1,107 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult"> <resultMap type="SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" /> <id property="dictId" column="dict_id"/>
<result property="dictName" column="dict_name" /> <result property="dictName" column="dict_name"/>
<result property="dictType" column="dict_type" /> <result property="dictType" column="dict_type"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectDictTypeVo"> <sql id="selectDictTypeVo">
select dict_id, dict_name, dict_type, status, create_by, create_time, remark select dict_id, dict_name, dict_type, status, create_by, create_time, remark
from sys_dict_type from sys_dict_type
</sql> </sql>
<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult"> <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
<where> <where>
<if test="dictName != null and dictName != ''"> <if test="dictName != null and dictName != ''">
AND dict_name like concat('%', #{dictName}, '%') AND dict_name like concat('%', #{dictName}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status = #{status} AND status = #{status}
</if> </if>
<if test="dictType != null and dictType != ''"> <if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%') AND dict_type like concat('%', #{dictType}, '%')
</if> </if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>
<select id="selectDictTypeAll" resultMap="SysDictTypeResult"> <select id="selectDictTypeAll" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
</select> </select>
<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult"> <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
where dict_id = #{dictId} where dict_id = #{dictId}
</select> </select>
<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult"> <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
where dict_type = #{dictType} where dict_type = #{dictType}
</select> </select>
<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult"> <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
where dict_type = #{dictType} limit 1 where dict_type = #{dictType} limit 1
</select> </select>
<delete id="deleteDictTypeById" parameterType="Long"> <delete id="deleteDictTypeById" parameterType="Long">
delete from sys_dict_type where dict_id = #{dictId} delete
</delete> from sys_dict_type
where dict_id = #{dictId}
<delete id="deleteDictTypeByIds" parameterType="Long"> </delete>
delete from sys_dict_type where dict_id in
<foreach collection="array" item="dictId" open="(" separator="," close=")"> <delete id="deleteDictTypeByIds" parameterType="Long">
#{dictId} delete from sys_dict_type where dict_id in
</foreach> <foreach collection="array" item="dictId" open="(" separator="," close=")">
</delete> #{dictId}
</foreach>
</delete>
<update id="updateDictType" parameterType="SysDictType">
update sys_dict_type
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where dict_id = #{dictId}
</update>
<insert id="insertDictType" parameterType="SysDictType">
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
<if test="status != null">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
<if test="dictName != null and dictName != ''">#{dictName},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
<if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<update id="updateDictType" parameterType="SysDictType">
update sys_dict_type
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where dict_id = #{dictId}
</update>
<insert id="insertDictType" parameterType="SysDictType">
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
<if test="status != null">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
<if test="dictName != null and dictName != ''">#{dictName},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
<if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
</mapper> </mapper>

96
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
View File

@ -1,57 +1,57 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper"> <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult"> <resultMap type="SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" /> <id property="infoId" column="info_id"/>
<result property="userName" column="user_name" /> <result property="userName" column="user_name"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="ipaddr" column="ipaddr" /> <result property="ipaddr" column="ipaddr"/>
<result property="loginLocation" column="login_location" /> <result property="loginLocation" column="login_location"/>
<result property="browser" column="browser" /> <result property="browser" column="browser"/>
<result property="os" column="os" /> <result property="os" column="os"/>
<result property="msg" column="msg" /> <result property="msg" column="msg"/>
<result property="loginTime" column="login_time" /> <result property="loginTime" column="login_time"/>
</resultMap> </resultMap>
<insert id="insertLogininfor" parameterType="SysLogininfor">
insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
</insert>
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
<where>
<if test="ipaddr != null and ipaddr != ''">
AND ipaddr like concat('%', #{ipaddr}, '%')
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="userName != null and userName != ''">
AND user_name like concat('%', #{userName}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by info_id desc
</select>
<delete id="deleteLogininforByIds" parameterType="Long">
delete from sys_logininfor where info_id in
<foreach collection="array" item="infoId" open="(" separator="," close=")">
#{infoId}
</foreach>
</delete>
<insert id="insertLogininfor" parameterType="SysLogininfor">
insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
</insert>
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
<where>
<if test="ipaddr != null and ipaddr != ''">
AND ipaddr like concat('%', #{ipaddr}, '%')
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="userName != null and userName != ''">
AND user_name like concat('%', #{userName}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by info_id desc
</select>
<delete id="deleteLogininforByIds" parameterType="Long">
delete from sys_logininfor where info_id in
<foreach collection="array" item="infoId" open="(" separator="," close=")">
#{infoId}
</foreach>
</delete>
<update id="cleanLogininfor"> <update id="cleanLogininfor">
truncate table sys_logininfor truncate table sys_logininfor
</update> </update>
</mapper> </mapper>

410
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -1,191 +1,243 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult"> <resultMap type="SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" /> <id property="menuId" column="menu_id"/>
<result property="menuName" column="menu_name" /> <result property="menuName" column="menu_name"/>
<result property="parentName" column="parent_name" /> <result property="parentName" column="parent_name"/>
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id"/>
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num"/>
<result property="path" column="path" /> <result property="path" column="path"/>
<result property="component" column="component" /> <result property="component" column="component"/>
<result property="isFrame" column="is_frame" /> <result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache" /> <result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type" /> <result property="menuType" column="menu_type"/>
<result property="visible" column="visible" /> <result property="visible" column="visible"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="perms" column="perms" /> <result property="perms" column="perms"/>
<result property="icon" column="icon" /> <result property="icon" column="icon"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
</resultMap> </resultMap>
<sql id="selectMenuVo"> <sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time select menu_id,
from sys_menu menu_name,
parent_id,
order_num,
path,
component,
is_frame,
is_cache,
menu_type,
visible,
status,
ifnull(perms, '') as perms,
icon,
create_time
from sys_menu
</sql> </sql>
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/> <include refid="selectMenuVo"/>
<where> <where>
<if test="menuName != null and menuName != ''"> <if test="menuName != null and menuName != ''">
AND menu_name like concat('%', #{menuName}, '%') AND menu_name like concat('%', #{menuName}, '%')
</if>
<if test="visible != null and visible != ''">
AND visible = #{visible}
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
</where>
order by parent_id, order_num
</select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
where ur.user_id = #{params.userId}
<if test="menuName != null and menuName != ''">
AND menu_name like concat('%', #{menuName}, '%')
</if>
<if test="visible != null and visible != ''">
AND visible = #{visible}
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
order by m.parent_id, m.order_num
</select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByRoleId" resultType="Integer">
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
<if test="menuCheckStrictly">
and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
</if> </if>
order by m.parent_id, m.order_num <if test="visible != null and visible != ''">
</select> AND visible = #{visible}
</if>
<select id="selectMenuPerms" resultType="String"> <if test="status != null and status != ''">
select distinct m.perms AND status = #{status}
from sys_menu m </if>
left join sys_role_menu rm on m.menu_id = rm.menu_id </where>
left join sys_user_role ur on rm.role_id = ur.role_id order by parent_id, order_num
</select> </select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String"> <select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.perms select distinct m.menu_id,
from sys_menu m m.parent_id,
left join sys_role_menu rm on m.menu_id = rm.menu_id m.menu_name,
left join sys_user_role ur on rm.role_id = ur.role_id m.path,
left join sys_role r on r.role_id = ur.role_id m.component,
where m.status = '0' and r.status = '0' and ur.user_id = #{userId} m.visible,
</select> m.status,
ifnull(m.perms, '') as perms,
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult"> m.is_frame,
<include refid="selectMenuVo"/> m.is_cache,
where menu_id = #{menuId} m.menu_type,
</select> m.icon,
m.order_num,
<select id="hasChildByMenuId" resultType="Integer"> m.create_time
select count(1) from sys_menu where parent_id = #{menuId} from sys_menu m
</select> where m.menu_type in ('M', 'C')
and m.status = 0
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult"> order by m.parent_id, m.order_num
<include refid="selectMenuVo"/> </select>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
<update id="updateMenu" parameterType="SysMenu">
update sys_menu
<set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
<if test="path != null and path != ''">path = #{path},</if>
<if test="component != null">component = #{component},</if>
<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
<if test="visible != null">visible = #{visible},</if>
<if test="status != null">status = #{status},</if>
<if test="perms !=null">perms = #{perms},</if>
<if test="icon !=null and icon != ''">icon = #{icon},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where menu_id = #{menuId}
</update>
<insert id="insertMenu" parameterType="SysMenu"> <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
insert into sys_menu( select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
<if test="menuId != null and menuId != 0">menu_id,</if> ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
<if test="parentId != null and parentId != 0">parent_id,</if> from sys_menu m
<if test="menuName != null and menuName != ''">menu_name,</if> left join sys_role_menu rm on m.menu_id = rm.menu_id
<if test="orderNum != null and orderNum != ''">order_num,</if> left join sys_user_role ur on rm.role_id = ur.role_id
<if test="path != null and path != ''">path,</if> left join sys_role ro on ur.role_id = ro.role_id
<if test="component != null and component != ''">component,</if> where ur.user_id = #{params.userId}
<if test="isFrame != null and isFrame != ''">is_frame,</if> <if test="menuName != null and menuName != ''">
<if test="isCache != null and isCache != ''">is_cache,</if> AND menu_name like concat('%', #{menuName}, '%')
<if test="menuType != null and menuType != ''">menu_type,</if> </if>
<if test="visible != null">visible,</if> <if test="visible != null and visible != ''">
<if test="status != null">status,</if> AND visible = #{visible}
<if test="perms !=null and perms != ''">perms,</if> </if>
<if test="icon != null and icon != ''">icon,</if> <if test="status != null and status != ''">
<if test="remark != null and remark != ''">remark,</if> AND status = #{status}
<if test="createBy != null and createBy != ''">create_by,</if> </if>
create_time order by m.parent_id, m.order_num
)values( </select>
<if test="menuId != null and menuId != 0">#{menuId},</if>
<if test="parentId != null and parentId != 0">#{parentId},</if> <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
<if test="menuName != null and menuName != ''">#{menuName},</if> select distinct m.menu_id,
<if test="orderNum != null and orderNum != ''">#{orderNum},</if> m.parent_id,
<if test="path != null and path != ''">#{path},</if> m.menu_name,
<if test="component != null and component != ''">#{component},</if> m.path,
<if test="isFrame != null and isFrame != ''">#{isFrame},</if> m.component,
<if test="isCache != null and isCache != ''">#{isCache},</if> m.visible,
<if test="menuType != null and menuType != ''">#{menuType},</if> m.status,
<if test="visible != null">#{visible},</if> ifnull(m.perms, '') as perms,
<if test="status != null">#{status},</if> m.is_frame,
<if test="perms !=null and perms != ''">#{perms},</if> m.is_cache,
<if test="icon != null and icon != ''">#{icon},</if> m.menu_type,
<if test="remark != null and remark != ''">#{remark},</if> m.icon,
<if test="createBy != null and createBy != ''">#{createBy},</if> m.order_num,
sysdate() m.create_time
) from sys_menu m
</insert> left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
<delete id="deleteMenuById" parameterType="Long"> left join sys_role ro on ur.role_id = ro.role_id
delete from sys_menu where menu_id = #{menuId} left join sys_user u on ur.user_id = u.user_id
</delete> where u.user_id = #{userId}
and m.menu_type in ('M', 'C')
and m.status = 0
AND ro.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByRoleId" resultType="Integer">
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
<if test="menuCheckStrictly">
and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
rm.menu_id and rm.role_id = #{roleId})
</if>
order by m.parent_id, m.order_num
</select>
<select id="selectMenuPerms" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
</select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role r on r.role_id = ur.role_id
where m.status = '0'
and r.status = '0'
and ur.user_id = #{userId}
</select>
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_id = #{menuId}
</select>
<select id="hasChildByMenuId" resultType="Integer">
select count(1)
from sys_menu
where parent_id = #{menuId}
</select>
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
<update id="updateMenu" parameterType="SysMenu">
update sys_menu
<set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
<if test="path != null and path != ''">path = #{path},</if>
<if test="component != null">component = #{component},</if>
<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
<if test="visible != null">visible = #{visible},</if>
<if test="status != null">status = #{status},</if>
<if test="perms !=null">perms = #{perms},</if>
<if test="icon !=null and icon != ''">icon = #{icon},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where menu_id = #{menuId}
</update>
<insert id="insertMenu" parameterType="SysMenu">
insert into sys_menu(
<if test="menuId != null and menuId != 0">menu_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
<if test="menuName != null and menuName != ''">menu_name,</if>
<if test="orderNum != null and orderNum != ''">order_num,</if>
<if test="path != null and path != ''">path,</if>
<if test="component != null and component != ''">component,</if>
<if test="isFrame != null and isFrame != ''">is_frame,</if>
<if test="isCache != null and isCache != ''">is_cache,</if>
<if test="menuType != null and menuType != ''">menu_type,</if>
<if test="visible != null">visible,</if>
<if test="status != null">status,</if>
<if test="perms !=null and perms != ''">perms,</if>
<if test="icon != null and icon != ''">icon,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
<if test="menuId != null and menuId != 0">#{menuId},</if>
<if test="parentId != null and parentId != 0">#{parentId},</if>
<if test="menuName != null and menuName != ''">#{menuName},</if>
<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
<if test="path != null and path != ''">#{path},</if>
<if test="component != null and component != ''">#{component},</if>
<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
<if test="isCache != null and isCache != ''">#{isCache},</if>
<if test="menuType != null and menuType != ''">#{menuType},</if>
<if test="visible != null">#{visible},</if>
<if test="status != null">#{status},</if>
<if test="perms !=null and perms != ''">#{perms},</if>
<if test="icon != null and icon != ''">#{icon},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<delete id="deleteMenuById" parameterType="Long">
delete
from sys_menu
where menu_id = #{menuId}
</delete>
</mapper> </mapper>

125
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

@ -1,89 +1,100 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult"> <resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" /> <result property="noticeId" column="notice_id"/>
<result property="noticeTitle" column="notice_title" /> <result property="noticeTitle" column="notice_title"/>
<result property="noticeType" column="notice_type" /> <result property="noticeType" column="notice_type"/>
<result property="noticeContent" column="notice_content" /> <result property="noticeContent" column="notice_content"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
</resultMap> </resultMap>
<sql id="selectNoticeVo"> <sql id="selectNoticeVo">
select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark select notice_id,
from sys_notice notice_title,
notice_type,
cast(notice_content as char) as notice_content,
status,
create_by,
create_time,
update_by,
update_time,
remark
from sys_notice
</sql> </sql>
<select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult"> <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/> <include refid="selectNoticeVo"/>
where notice_id = #{noticeId} where notice_id = #{noticeId}
</select> </select>
<select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult"> <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/> <include refid="selectNoticeVo"/>
<where> <where>
<if test="noticeTitle != null and noticeTitle != ''"> <if test="noticeTitle != null and noticeTitle != ''">
AND notice_title like concat('%', #{noticeTitle}, '%') AND notice_title like concat('%', #{noticeTitle}, '%')
</if> </if>
<if test="noticeType != null and noticeType != ''"> <if test="noticeType != null and noticeType != ''">
AND notice_type = #{noticeType} AND notice_type = #{noticeType}
</if> </if>
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
AND create_by like concat('%', #{createBy}, '%') AND create_by like concat('%', #{createBy}, '%')
</if> </if>
</where> </where>
</select> </select>
<insert id="insertNotice" parameterType="SysNotice"> <insert id="insertNotice" parameterType="SysNotice">
insert into sys_notice ( insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if> <if test="noticeTitle != null and noticeTitle != '' ">notice_title,</if>
<if test="noticeType != null and noticeType != '' ">notice_type, </if> <if test="noticeType != null and noticeType != '' ">notice_type,</if>
<if test="noticeContent != null and noticeContent != '' ">notice_content, </if> <if test="noticeContent != null and noticeContent != '' ">notice_content,</if>
<if test="status != null and status != '' ">status, </if> <if test="status != null and status != '' ">status,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)values( )values(
<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if> <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle},</if>
<if test="noticeType != null and noticeType != ''">#{noticeType}, </if> <if test="noticeType != null and noticeType != ''">#{noticeType},</if>
<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if> <if test="noticeContent != null and noticeContent != ''">#{noticeContent},</if>
<if test="status != null and status != ''">#{status}, </if> <if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate() sysdate()
) )
</insert> </insert>
<update id="updateNotice" parameterType="SysNotice"> <update id="updateNotice" parameterType="SysNotice">
update sys_notice update sys_notice
<set> <set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if> <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle},</if>
<if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if> <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType},</if>
<if test="noticeContent != null">notice_content = #{noticeContent}, </if> <if test="noticeContent != null">notice_content = #{noticeContent},</if>
<if test="status != null and status != ''">status = #{status}, </if> <if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where notice_id = #{noticeId} where notice_id = #{noticeId}
</update> </update>
<delete id="deleteNoticeById" parameterType="Long"> <delete id="deleteNoticeById" parameterType="Long">
delete from sys_notice where notice_id = #{noticeId} delete
from sys_notice
where notice_id = #{noticeId}
</delete> </delete>
<delete id="deleteNoticeByIds" parameterType="Long"> <delete id="deleteNoticeByIds" parameterType="Long">
delete from sys_notice where notice_id in delete from sys_notice where notice_id in
<foreach item="noticeId" collection="array" open="(" separator="," close=")"> <foreach item="noticeId" collection="array" open="(" separator="," close=")">
#{noticeId} #{noticeId}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

162
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
View File

@ -1,82 +1,100 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper"> <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult"> <resultMap type="SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" /> <id property="operId" column="oper_id"/>
<result property="title" column="title" /> <result property="title" column="title"/>
<result property="businessType" column="business_type" /> <result property="businessType" column="business_type"/>
<result property="method" column="method" /> <result property="method" column="method"/>
<result property="requestMethod" column="request_method" /> <result property="requestMethod" column="request_method"/>
<result property="operatorType" column="operator_type" /> <result property="operatorType" column="operator_type"/>
<result property="operName" column="oper_name" /> <result property="operName" column="oper_name"/>
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name"/>
<result property="operUrl" column="oper_url" /> <result property="operUrl" column="oper_url"/>
<result property="operIp" column="oper_ip" /> <result property="operIp" column="oper_ip"/>
<result property="operLocation" column="oper_location" /> <result property="operLocation" column="oper_location"/>
<result property="operParam" column="oper_param" /> <result property="operParam" column="oper_param"/>
<result property="jsonResult" column="json_result" /> <result property="jsonResult" column="json_result"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="errorMsg" column="error_msg" /> <result property="errorMsg" column="error_msg"/>
<result property="operTime" column="oper_time" /> <result property="operTime" column="oper_time"/>
</resultMap> </resultMap>
<sql id="selectOperLogVo"> <sql id="selectOperLogVo">
select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time select oper_id,
title,
business_type,
method,
request_method,
operator_type,
oper_name,
dept_name,
oper_url,
oper_ip,
oper_location,
oper_param,
json_result,
status,
error_msg,
oper_time
from sys_oper_log from sys_oper_log
</sql> </sql>
<insert id="insertOperlog" parameterType="SysOperLog"> <insert id="insertOperlog" parameterType="SysOperLog">
insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name,
values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg,
</insert> oper_time)
values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName},
<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult"> #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
<include refid="selectOperLogVo"/> </insert>
<where>
<if test="title != null and title != ''"> <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
AND title like concat('%', #{title}, '%') <include refid="selectOperLogVo"/>
</if> <where>
<if test="businessType != null and businessType != ''"> <if test="title != null and title != ''">
AND business_type = #{businessType} AND title like concat('%', #{title}, '%')
</if> </if>
<if test="businessTypes != null and businessTypes.length > 0"> <if test="businessType != null and businessType != ''">
AND business_type in AND business_type = #{businessType}
<foreach collection="businessTypes" item="businessType" open="(" separator="," close=")"> </if>
#{businessType} <if test="businessTypes != null and businessTypes.length > 0">
</foreach> AND business_type in
</if> <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
<if test="status != null"> #{businessType}
AND status = #{status} </foreach>
</if> </if>
<if test="operName != null and operName != ''"> <if test="status != null">
AND oper_name like concat('%', #{operName}, '%') AND status = #{status}
</if> </if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="operName != null and operName != ''">
and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND oper_name like concat('%', #{operName}, '%')
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
</where> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
order by oper_id desc and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</select> </if>
</where>
<delete id="deleteOperLogByIds" parameterType="Long"> order by oper_id desc
delete from sys_oper_log where oper_id in </select>
<foreach collection="array" item="operId" open="(" separator="," close=")">
#{operId} <delete id="deleteOperLogByIds" parameterType="Long">
</foreach> delete from sys_oper_log where oper_id in
</delete> <foreach collection="array" item="operId" open="(" separator="," close=")">
#{operId}
<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult"> </foreach>
<include refid="selectOperLogVo"/> </delete>
where oper_id = #{operId}
</select> <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
<include refid="selectOperLogVo"/>
<update id="cleanOperLog"> where oper_id = #{operId}
</select>
<update id="cleanOperLog">
truncate table sys_oper_log truncate table sys_oper_log
</update> </update>

237
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
View File

@ -1,122 +1,131 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult"> <resultMap type="SysPost" id="SysPostResult">
<id property="postId" column="post_id" /> <id property="postId" column="post_id"/>
<result property="postCode" column="post_code" /> <result property="postCode" column="post_code"/>
<result property="postName" column="post_name" /> <result property="postName" column="post_name"/>
<result property="postSort" column="post_sort" /> <result property="postSort" column="post_sort"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
</resultMap> </resultMap>
<sql id="selectPostVo"> <sql id="selectPostVo">
select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark select post_id,
from sys_post post_code,
post_name,
post_sort,
status,
create_by,
create_time,
remark
from sys_post
</sql> </sql>
<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult"> <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
<where> <where>
<if test="postCode != null and postCode != ''"> <if test="postCode != null and postCode != ''">
AND post_code like concat('%', #{postCode}, '%') AND post_code like concat('%', #{postCode}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status = #{status} AND status = #{status}
</if> </if>
<if test="postName != null and postName != ''"> <if test="postName != null and postName != ''">
AND post_name like concat('%', #{postName}, '%') AND post_name like concat('%', #{postName}, '%')
</if> </if>
</where> </where>
</select> </select>
<select id="selectPostAll" resultMap="SysPostResult"> <select id="selectPostAll" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
</select> </select>
<select id="selectPostById" parameterType="Long" resultMap="SysPostResult"> <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
where post_id = #{postId} where post_id = #{postId}
</select> </select>
<select id="selectPostListByUserId" parameterType="Long" resultType="Integer"> <select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
select p.post_id select p.post_id
from sys_post p from sys_post p
left join sys_user_post up on up.post_id = p.post_id left join sys_user_post up on up.post_id = p.post_id
left join sys_user u on u.user_id = up.user_id left join sys_user u on u.user_id = up.user_id
where u.user_id = #{userId} where u.user_id = #{userId}
</select> </select>
<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult"> <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
select p.post_id, p.post_name, p.post_code select p.post_id, p.post_name, p.post_code
from sys_post p from sys_post p
left join sys_user_post up on up.post_id = p.post_id left join sys_user_post up on up.post_id = p.post_id
left join sys_user u on u.user_id = up.user_id left join sys_user u on u.user_id = up.user_id
where u.user_name = #{userName} where u.user_name = #{userName}
</select> </select>
<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult"> <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
where post_name=#{postName} limit 1 where post_name=#{postName} limit 1
</select> </select>
<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult"> <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
where post_code=#{postCode} limit 1 where post_code=#{postCode} limit 1
</select> </select>
<update id="updatePost" parameterType="SysPost"> <update id="updatePost" parameterType="SysPost">
update sys_post update sys_post
<set> <set>
<if test="postCode != null and postCode != ''">post_code = #{postCode},</if> <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
<if test="postName != null and postName != ''">post_name = #{postName},</if> <if test="postName != null and postName != ''">post_name = #{postName},</if>
<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if> <if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
<if test="status != null and status != ''">status = #{status},</if> <if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where post_id = #{postId} where post_id = #{postId}
</update> </update>
<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId"> <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
insert into sys_post( insert into sys_post(
<if test="postId != null and postId != 0">post_id,</if> <if test="postId != null and postId != 0">post_id,</if>
<if test="postCode != null and postCode != ''">post_code,</if> <if test="postCode != null and postCode != ''">post_code,</if>
<if test="postName != null and postName != ''">post_name,</if> <if test="postName != null and postName != ''">post_name,</if>
<if test="postSort != null and postSort != ''">post_sort,</if> <if test="postSort != null and postSort != ''">post_sort,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)values( )values(
<if test="postId != null and postId != 0">#{postId},</if> <if test="postId != null and postId != 0">#{postId},</if>
<if test="postCode != null and postCode != ''">#{postCode},</if> <if test="postCode != null and postCode != ''">#{postCode},</if>
<if test="postName != null and postName != ''">#{postName},</if> <if test="postName != null and postName != ''">#{postName},</if>
<if test="postSort != null and postSort != ''">#{postSort},</if> <if test="postSort != null and postSort != ''">#{postSort},</if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate() sysdate()
) )
</insert> </insert>
<delete id="deletePostById" parameterType="Long"> <delete id="deletePostById" parameterType="Long">
delete from sys_post where post_id = #{postId} delete
</delete> from sys_post
where post_id = #{postId}
<delete id="deletePostByIds" parameterType="Long"> </delete>
delete from sys_post where post_id in
<foreach collection="array" item="postId" open="(" separator="," close=")"> <delete id="deletePostByIds" parameterType="Long">
#{postId} delete from sys_post where post_id in
</foreach> <foreach collection="array" item="postId" open="(" separator="," close=")">
</delete> #{postId}
</foreach>
</delete>
</mapper> </mapper>

60
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View File

@ -1,34 +1,38 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult"> <resultMap type="SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id"/>
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id"/>
</resultMap> </resultMap>
<delete id="deleteRoleDeptByRoleId" parameterType="Long">
delete
from sys_role_dept
where role_id = #{roleId}
</delete>
<select id="selectCountRoleDeptByDeptId" resultType="Integer">
select count(1)
from sys_role_dept
where dept_id = #{deptId}
</select>
<delete id="deleteRoleDept" parameterType="Long">
delete from sys_role_dept where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
<insert id="batchRoleDept">
insert into sys_role_dept(role_id, dept_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.deptId})
</foreach>
</insert>
<delete id="deleteRoleDeptByRoleId" parameterType="Long">
delete from sys_role_dept where role_id=#{roleId}
</delete>
<select id="selectCountRoleDeptByDeptId" resultType="Integer">
select count(1) from sys_role_dept where dept_id=#{deptId}
</select>
<delete id="deleteRoleDept" parameterType="Long">
delete from sys_role_dept where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
<insert id="batchRoleDept">
insert into sys_role_dept(role_id, dept_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.deptId})
</foreach>
</insert>
</mapper> </mapper>

297
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -1,149 +1,160 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult"> <resultMap type="SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" /> <id property="roleId" column="role_id"/>
<result property="roleName" column="role_name" /> <result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key" /> <result property="roleKey" column="role_key"/>
<result property="roleSort" column="role_sort" /> <result property="roleSort" column="role_sort"/>
<result property="dataScope" column="data_scope" /> <result property="dataScope" column="data_scope"/>
<result property="menuCheckStrictly" column="menu_check_strictly" /> <result property="menuCheckStrictly" column="menu_check_strictly"/>
<result property="deptCheckStrictly" column="dept_check_strictly" /> <result property="deptCheckStrictly" column="dept_check_strictly"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
</resultMap> </resultMap>
<sql id="selectRoleVo"> <sql id="selectRoleVo">
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, select distinct r.role_id,
r.status, r.del_flag, r.create_time, r.remark r.role_name,
from sys_role r r.role_key,
left join sys_user_role ur on ur.role_id = r.role_id r.role_sort,
left join sys_user u on u.user_id = ur.user_id r.data_scope,
left join sys_dept d on u.dept_id = d.dept_id r.menu_check_strictly,
</sql> r.dept_check_strictly,
r.status,
<select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult"> r.del_flag,
<include refid="selectRoleVo"/> r.create_time,
where r.del_flag = '0' r.remark
<if test="roleName != null and roleName != ''"> from sys_role r
AND r.role_name like concat('%', #{roleName}, '%') left join sys_user_role ur on ur.role_id = r.role_id
</if> left join sys_user u on u.user_id = ur.user_id
<if test="status != null and status != ''"> left join sys_dept d on u.dept_id = d.dept_id
AND r.status = #{status} </sql>
</if>
<if test="roleKey != null and roleKey != ''"> <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
AND r.role_key like concat('%', #{roleKey}, '%') <include refid="selectRoleVo"/>
</if> where r.del_flag = '0'
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="roleName != null and roleName != ''">
and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND r.role_name like concat('%', #{roleName}, '%')
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="status != null and status != ''">
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') AND r.status = #{status}
</if> </if>
<!-- 数据范围过滤 --> <if test="roleKey != null and roleKey != ''">
${params.dataScope} AND r.role_key like concat('%', #{roleKey}, '%')
order by r.role_sort </if>
</select> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult"> </if>
<include refid="selectRoleVo"/> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
WHERE r.del_flag = '0' and ur.user_id = #{userId} and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</select> </if>
<!-- 数据范围过滤 -->
<select id="selectRoleAll" resultMap="SysRoleResult"> ${params.dataScope}
<include refid="selectRoleVo"/> order by r.role_sort
</select> </select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer"> <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
select r.role_id <include refid="selectRoleVo"/>
from sys_role r WHERE r.del_flag = '0' and ur.user_id = #{userId}
left join sys_user_role ur on ur.role_id = r.role_id </select>
left join sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId} <select id="selectRoleAll" resultMap="SysRoleResult">
</select> <include refid="selectRoleVo"/>
</select>
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/> <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
where r.role_id = #{roleId} select r.role_id
</select> from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult"> left join sys_user u on u.user_id = ur.user_id
<include refid="selectRoleVo"/> where u.user_id = #{userId}
WHERE r.del_flag = '0' and u.user_name = #{userName} </select>
</select>
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult"> <include refid="selectRoleVo"/>
<include refid="selectRoleVo"/> where r.role_id = #{roleId}
where r.role_name=#{roleName} limit 1 </select>
</select>
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult"> <include refid="selectRoleVo"/>
<include refid="selectRoleVo"/> WHERE r.del_flag = '0' and u.user_name = #{userName}
where r.role_key=#{roleKey} limit 1 </select>
</select>
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId"> <include refid="selectRoleVo"/>
insert into sys_role( where r.role_name=#{roleName} limit 1
<if test="roleId != null and roleId != 0">role_id,</if> </select>
<if test="roleName != null and roleName != ''">role_name,</if>
<if test="roleKey != null and roleKey != ''">role_key,</if> <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
<if test="roleSort != null and roleSort != ''">role_sort,</if> <include refid="selectRoleVo"/>
<if test="dataScope != null and dataScope != ''">data_scope,</if> where r.role_key=#{roleKey} limit 1
<if test="menuCheckStrictly != null">menu_check_strictly,</if> </select>
<if test="deptCheckStrictly != null">dept_check_strictly,</if>
<if test="status != null and status != ''">status,</if> <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
<if test="remark != null and remark != ''">remark,</if> insert into sys_role(
<if test="createBy != null and createBy != ''">create_by,</if> <if test="roleId != null and roleId != 0">role_id,</if>
create_time <if test="roleName != null and roleName != ''">role_name,</if>
)values( <if test="roleKey != null and roleKey != ''">role_key,</if>
<if test="roleId != null and roleId != 0">#{roleId},</if> <if test="roleSort != null and roleSort != ''">role_sort,</if>
<if test="roleName != null and roleName != ''">#{roleName},</if> <if test="dataScope != null and dataScope != ''">data_scope,</if>
<if test="roleKey != null and roleKey != ''">#{roleKey},</if> <if test="menuCheckStrictly != null">menu_check_strictly,</if>
<if test="roleSort != null and roleSort != ''">#{roleSort},</if> <if test="deptCheckStrictly != null">dept_check_strictly,</if>
<if test="dataScope != null and dataScope != ''">#{dataScope},</if> <if test="status != null and status != ''">status,</if>
<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if> <if test="remark != null and remark != ''">remark,</if>
<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="status != null and status != ''">#{status},</if> create_time
<if test="remark != null and remark != ''">#{remark},</if> )values(
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="roleId != null and roleId != 0">#{roleId},</if>
sysdate() <if test="roleName != null and roleName != ''">#{roleName},</if>
) <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
</insert> <if test="roleSort != null and roleSort != ''">#{roleSort},</if>
<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
<update id="updateRole" parameterType="SysRole"> <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
update sys_role <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
<set> <if test="status != null and status != ''">#{status},</if>
<if test="roleName != null and roleName != ''">role_name = #{roleName},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if> sysdate()
<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if> )
<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if> </insert>
<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
<if test="status != null and status != ''">status = #{status},</if> <update id="updateRole" parameterType="SysRole">
<if test="remark != null">remark = #{remark},</if> update sys_role
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <set>
update_time = sysdate() <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
</set> <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
where role_id = #{roleId} <if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
</update> <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where role_id = #{roleId}
</update>
<delete id="deleteRoleById" parameterType="Long">
update sys_role
set del_flag = '2'
where role_id = #{roleId}
</delete>
<delete id="deleteRoleByIds" parameterType="Long">
update sys_role set del_flag = '2' where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
<delete id="deleteRoleById" parameterType="Long">
update sys_role set del_flag = '2' where role_id = #{roleId}
</delete>
<delete id="deleteRoleByIds" parameterType="Long">
update sys_role set del_flag = '2' where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
</mapper> </mapper>

56
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View File

@ -1,34 +1,38 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult"> <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id"/>
<result property="menuId" column="menu_id" /> <result property="menuId" column="menu_id"/>
</resultMap> </resultMap>
<select id="checkMenuExistRole" resultType="Integer">
select count(1) from sys_role_menu where menu_id = #{menuId}
</select>
<delete id="deleteRoleMenuByRoleId" parameterType="Long"> <select id="checkMenuExistRole" resultType="Integer">
delete from sys_role_menu where role_id=#{roleId} select count(1)
</delete> from sys_role_menu
where menu_id = #{menuId}
<delete id="deleteRoleMenu" parameterType="Long"> </select>
delete from sys_role_menu where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")"> <delete id="deleteRoleMenuByRoleId" parameterType="Long">
#{roleId} delete
from sys_role_menu
where role_id = #{roleId}
</delete>
<delete id="deleteRoleMenu" parameterType="Long">
delete from sys_role_menu where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach> </foreach>
</delete> </delete>
<insert id="batchRoleMenu">
insert into sys_role_menu(role_id, menu_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.menuId})
</foreach>
</insert>
<insert id="batchRoleMenu">
insert into sys_role_menu(role_id, menu_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.menuId})
</foreach>
</insert>
</mapper> </mapper>

390
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -1,182 +1,224 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult"> <resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" /> <id property="userId" column="user_id"/>
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id"/>
<result property="userName" column="user_name" /> <result property="userName" column="user_name"/>
<result property="nickName" column="nick_name" /> <result property="nickName" column="nick_name"/>
<result property="email" column="email" /> <result property="email" column="email"/>
<result property="phonenumber" column="phonenumber" /> <result property="phonenumber" column="phonenumber"/>
<result property="sex" column="sex" /> <result property="sex" column="sex"/>
<result property="avatar" column="avatar" /> <result property="avatar" column="avatar"/>
<result property="password" column="password" /> <result property="password" column="password"/>
<result property="status" column="status" /> <result property="status" column="status"/>
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag"/>
<result property="loginIp" column="login_ip" /> <result property="loginIp" column="login_ip"/>
<result property="loginDate" column="login_date" /> <result property="loginDate" column="login_date"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" /> <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap> </resultMap>
<resultMap id="deptResult" type="SysDept"> <resultMap id="deptResult" type="SysDept">
<id property="deptId" column="dept_id" /> <id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id"/>
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name"/>
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num"/>
<result property="leader" column="leader" /> <result property="leader" column="leader"/>
<result property="status" column="dept_status" /> <result property="status" column="dept_status"/>
</resultMap> </resultMap>
<resultMap id="RoleResult" type="SysRole"> <resultMap id="RoleResult" type="SysRole">
<id property="roleId" column="role_id" /> <id property="roleId" column="role_id"/>
<result property="roleName" column="role_name" /> <result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key" /> <result property="roleKey" column="role_key"/>
<result property="roleSort" column="role_sort" /> <result property="roleSort" column="role_sort"/>
<result property="dataScope" column="data_scope" /> <result property="dataScope" column="data_scope"/>
<result property="status" column="role_status" /> <result property="status" column="role_status"/>
</resultMap> </resultMap>
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, select u.user_id,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, u.dept_id,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status u.user_name,
u.nick_name,
u.email,
u.avatar,
u.phonenumber,
u.password,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_id,
d.parent_id,
d.dept_name,
d.order_num,
d.leader,
d.status as dept_status,
r.role_id,
r.role_name,
r.role_key,
r.role_sort,
r.data_scope,
r.status as role_status
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
</sql> </sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
left join sys_dept d on u.dept_id = d.dept_id u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
where u.del_flag = '0' sys_user u
<if test="userName != null and userName != ''"> left join sys_dept d on u.dept_id = d.dept_id
AND u.user_name like concat('%', #{userName}, '%') where u.del_flag = '0'
</if> <if test="userName != null and userName != ''">
<if test="status != null and status != ''"> AND u.user_name like concat('%', #{userName}, '%')
AND u.status = #{status} </if>
</if> <if test="status != null and status != ''">
<if test="phonenumber != null and phonenumber != ''"> AND u.status = #{status}
AND u.phonenumber like concat('%', #{phonenumber}, '%') </if>
</if> <if test="phonenumber != null and phonenumber != ''">
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> AND u.phonenumber like concat('%', #{phonenumber}, '%')
AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') </if>
</if> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') </if>
</if> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
<if test="deptId != null and deptId != 0"> AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) </if>
</if> <if test="deptId != null and deptId != 0">
<!-- 数据范围过滤 --> AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
${params.dataScope} ancestors) ))
</select> </if>
<!-- 数据范围过滤 -->
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> ${params.dataScope}
<include refid="selectUserVo"/> </select>
where u.user_name = #{userName}
</select> <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> where u.user_name = #{userName}
<include refid="selectUserVo"/> </select>
where u.user_id = #{userId}
</select> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
<select id="checkUserNameUnique" parameterType="String" resultType="int"> where u.user_id = #{userId}
select count(1) from sys_user where user_name = #{userName} limit 1 </select>
</select>
<select id="checkUserNameUnique" parameterType="String" resultType="int">
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> select count(1)
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1 from sys_user
</select> where user_name = #{userName} limit 1
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} limit 1 <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
</select> select user_id, phonenumber
from sys_user
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> where phonenumber = #{phonenumber} limit 1
insert into sys_user( </select>
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
<if test="userName != null and userName != ''">user_name,</if> select user_id, email
<if test="nickName != null and nickName != ''">nick_name,</if> from sys_user
<if test="email != null and email != ''">email,</if> where email = #{email} limit 1
<if test="avatar != null and avatar != ''">avatar,</if> </select>
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
<if test="sex != null and sex != ''">sex,</if> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
<if test="password != null and password != ''">password,</if> insert into sys_user(
<if test="status != null and status != ''">status,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="userName != null and userName != ''">user_name,</if>
create_time <if test="nickName != null and nickName != ''">nick_name,</if>
)values( <if test="email != null and email != ''">email,</if>
<if test="userId != null and userId != ''">#{userId},</if> <if test="avatar != null and avatar != ''">avatar,</if>
<if test="deptId != null and deptId != ''">#{deptId},</if> <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
<if test="userName != null and userName != ''">#{userName},</if> <if test="sex != null and sex != ''">sex,</if>
<if test="nickName != null and nickName != ''">#{nickName},</if> <if test="password != null and password != ''">password,</if>
<if test="email != null and email != ''">#{email},</if> <if test="status != null and status != ''">status,</if>
<if test="avatar != null and avatar != ''">#{avatar},</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if> <if test="remark != null and remark != ''">remark,</if>
<if test="sex != null and sex != ''">#{sex},</if> create_time
<if test="password != null and password != ''">#{password},</if> )values(
<if test="status != null and status != ''">#{status},</if> <if test="userId != null and userId != ''">#{userId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="userName != null and userName != ''">#{userName},</if>
sysdate() <if test="nickName != null and nickName != ''">#{nickName},</if>
) <if test="email != null and email != ''">#{email},</if>
</insert> <if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
<update id="updateUser" parameterType="SysUser"> <if test="sex != null and sex != ''">#{sex},</if>
update sys_user <if test="password != null and password != ''">#{password},</if>
<set> <if test="status != null and status != ''">#{status},</if>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> sysdate()
<if test="email != null ">email = #{email},</if> )
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if> </insert>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if> <update id="updateUser" parameterType="SysUser">
<if test="password != null and password != ''">password = #{password},</if> update sys_user
<if test="status != null and status != ''">status = #{status},</if> <set>
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="loginDate != null">login_date = #{loginDate},</if> <if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="remark != null">remark = #{remark},</if> <if test="email != null ">email = #{email},</if>
update_time = sysdate() <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
</set> <if test="sex != null and sex != ''">sex = #{sex},</if>
where user_id = #{userId} <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
</update> <if test="password != null and password != ''">password = #{password},</if>
<if test="status != null and status != ''">status = #{status},</if>
<update id="updateUserStatus" parameterType="SysUser"> <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
update sys_user set status = #{status} where user_id = #{userId} <if test="loginDate != null">login_date = #{loginDate},</if>
</update> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<update id="updateUserAvatar" parameterType="SysUser"> update_time = sysdate()
update sys_user set avatar = #{avatar} where user_name = #{userName} </set>
</update> where user_id = #{userId}
</update>
<update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName} <update id="updateUserStatus" parameterType="SysUser">
</update> update sys_user
set status = #{status}
<delete id="deleteUserById" parameterType="Long"> where user_id = #{userId}
update sys_user set del_flag = '2' where user_id = #{userId} </update>
</delete>
<update id="updateUserAvatar" parameterType="SysUser">
<delete id="deleteUserByIds" parameterType="Long"> update sys_user
update sys_user set del_flag = '2' where user_id in set avatar = #{avatar}
<foreach collection="array" item="userId" open="(" separator="," close=")"> where user_name = #{userName}
#{userId} </update>
</foreach>
</delete> <update id="resetUserPwd" parameterType="SysUser">
update sys_user
set password = #{password}
where user_name = #{userName}
</update>
<delete id="deleteUserById" parameterType="Long">
update sys_user
set del_flag = '2'
where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
</mapper> </mapper>

60
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
View File

@ -1,34 +1,38 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult"> <resultMap type="SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" /> <result property="userId" column="user_id"/>
<result property="postId" column="post_id" /> <result property="postId" column="post_id"/>
</resultMap> </resultMap>
<delete id="deleteUserPostByUserId" parameterType="Long">
delete
from sys_user_post
where user_id = #{userId}
</delete>
<select id="countUserPostById" resultType="Integer">
select count(1)
from sys_user_post
where post_id = #{postId}
</select>
<delete id="deleteUserPost" parameterType="Long">
delete from sys_user_post where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
<insert id="batchUserPost">
insert into sys_user_post(user_id, post_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.postId})
</foreach>
</insert>
<delete id="deleteUserPostByUserId" parameterType="Long">
delete from sys_user_post where user_id=#{userId}
</delete>
<select id="countUserPostById" resultType="Integer">
select count(1) from sys_user_post where post_id=#{postId}
</select>
<delete id="deleteUserPost" parameterType="Long">
delete from sys_user_post where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
<insert id="batchUserPost">
insert into sys_user_post(user_id, post_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.postId})
</foreach>
</insert>
</mapper> </mapper>

83
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@ -1,44 +1,51 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult"> <resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" /> <result property="userId" column="user_id"/>
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id"/>
</resultMap> </resultMap>
<delete id="deleteUserRoleByUserId" parameterType="Long"> <delete id="deleteUserRoleByUserId" parameterType="Long">
delete from sys_user_role where user_id=#{userId} delete
</delete> from sys_user_role
where user_id = #{userId}
<select id="countUserRoleByRoleId" resultType="Integer"> </delete>
select count(1) from sys_user_role where role_id=#{roleId}
</select> <select id="countUserRoleByRoleId" resultType="Integer">
select count(1)
<delete id="deleteUserRole" parameterType="Long"> from sys_user_role
delete from sys_user_role where user_id in where role_id = #{roleId}
<foreach collection="array" item="userId" open="(" separator="," close=")"> </select>
#{userId}
</foreach> <delete id="deleteUserRole" parameterType="Long">
</delete> delete from sys_user_role where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
<insert id="batchUserRole"> #{userId}
insert into sys_user_role(user_id, role_id) values </foreach>
<foreach item="item" index="index" collection="list" separator=","> </delete>
(#{item.userId},#{item.roleId})
</foreach> <insert id="batchUserRole">
</insert> insert into sys_user_role(user_id, role_id) values
<foreach item="item" index="index" collection="list" separator=",">
<delete id="deleteUserRoleInfo" parameterType="SysUserRole"> (#{item.userId},#{item.roleId})
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} </foreach>
</delete> </insert>
<delete id="deleteUserRoleInfos"> <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
delete from sys_user_role where role_id=#{roleId} and user_id in delete
<foreach collection="userIds" item="userId" open="(" separator="," close=")"> from sys_user_role
#{userId} where user_id = #{userId}
</foreach> and role_id = #{roleId}
</delete> </delete>
<delete id="deleteUserRoleInfos">
delete from sys_user_role where role_id=#{roleId} and user_id in
<foreach collection="userIds" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
</mapper> </mapper>