若依 1.1

ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java

 package com.ruoyi.project.system.domain;
 
+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.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
@@ -12,21 +18,27 @@ public class SysRole extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
     private Long roleId;
 
     /** 角色名称 */
+    @Excel(name = "角色名称")
     private String roleName;
 
     /** 角色权限 */
+    @Excel(name = "角色权限")
     private String roleKey;
 
     /** 角色排序 */
+    @Excel(name = "角色排序")
     private String roleSort;
 
-    /** 数据范围 */
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
     private String dataScope;
 
     /** 角色状态（0正常 1停用） */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -71,6 +83,8 @@ public class SysRole extends BaseEntity
         return roleId != null && 1L == roleId;
     }
 
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
     public String getRoleName()
     {
         return roleName;
@@ -81,6 +95,8 @@ public class SysRole extends BaseEntity
         this.roleName = roleName;
     }
 
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
     public String getRoleKey()
     {
         return roleKey;
@@ -91,6 +107,7 @@ public class SysRole extends BaseEntity
         this.roleKey = roleKey;
     }
 
+    @NotBlank(message = "显示顺序不能为空")
     public String getRoleSort()
     {
         return roleSort;
@@ -160,4 +177,21 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
+    
+    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("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
 }

ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java

@@ -2,6 +2,14 @@ package com.ruoyi.project.system.domain;
 
 import java.util.Date;
 import java.util.List;
+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.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excels;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
@@ -14,24 +22,30 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
     /** 部门ID */
     private Long deptId;
 
     /** 用户账号 */
+    @Excel(name = "登录名称")
     private String userName;
 
     /** 用户昵称 */
+    @Excel(name = "用户名称")
     private String nickName;
 
     /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
     private String email;
 
     /** 手机号码 */
+    @Excel(name = "手机号码")
     private String phonenumber;
 
     /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
     /** 用户头像 */
@@ -44,18 +58,22 @@ public class SysUser extends BaseEntity
     private String salt;
 
     /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
     /** 最后登陆IP */
+    @Excel(name = "最后登陆IP")
     private String loginIp;
 
     /** 最后登陆时间 */
+    @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loginDate;
 
     /** 部门对象 */
+    @Excels({ @Excel(name = "部门名称", targetAttr = "deptName"), @Excel(name = "部门负责人", targetAttr = "leader") })
     private SysDept dept;
 
     /** 角色对象 */
@@ -107,6 +125,7 @@ public class SysUser extends BaseEntity
         this.deptId = deptId;
     }
 
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
     public String getNickName()
     {
         return nickName;
@@ -117,6 +136,8 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName()
     {
         return userName;
@@ -127,6 +148,8 @@ public class SysUser extends BaseEntity
         this.userName = userName;
     }
 
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
     public String getEmail()
     {
         return email;
@@ -137,6 +160,7 @@ public class SysUser extends BaseEntity
         this.email = email;
     }
 
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
     public String getPhonenumber()
     {
         return phonenumber;
@@ -266,5 +290,30 @@ public class SysUser extends BaseEntity
     {
         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();
+    }
 }

ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java

@@ -53,8 +53,16 @@ public interface SysConfigMapper
     /**
      * 删除参数配置
      * 
-     * @param configId 需要删除的数据ID
+     * @param configId 参数ID
      * @return 结果
      */
     public int deleteConfigById(Long configId);
+
+    /**
+     * 批量删除参数信息
+     * 
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    public int deleteConfigByIds(Long[] configIds);
 }
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java

@@ -60,6 +60,14 @@ public interface SysDictDataMapper
      */
     public int deleteDictDataById(Long dictCode);
 
+    /**
+     * 批量删除字典数据信息
+     * 
+     * @param dictCodes 需要删除的字典数据ID
+     * @return 结果
+     */
+    public int deleteDictDataByIds(Long[] dictCodes);
+
     /**
      * 新增字典数据信息
      *