完成 Role 模块的迁移

src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.dashboard.modules.system.controller.permission;
 
 import cn.iocoder.dashboard.common.pojo.CommonResult;
+import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleDataScopeReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleMenuReqVO;
 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
 import io.swagger.annotations.Api;
@@ -43,6 +44,15 @@ public class SysPermissionController {
         return success(true);
     }
 
+    @PostMapping("/assign-role-data-scope")
+    @ApiOperation("赋予角色数据权限")
+//    @RequiresPermissions("system:permission:assign-role-data-scope")
+    public CommonResult<Boolean> assignRoleDataScope(
+            @Validated @RequestBody SysPermissionAssignRoleDataScopeReqVO reqVO) {
+        permissionService.assignRoleDataScope(reqVO.getRoleId(), reqVO.getDataScope(), reqVO.getDataScopeDeptIds());
+        return success(true);
+    }
+
 //    @GetMapping("/list-admin-roles")
 //    @ApiOperation("获得管理员拥有的角色编号列表")
 ////    @RequiresPermissions("system:permission:assign-admin-role")

src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java

@@ -0,0 +1,27 @@
+package cn.iocoder.dashboard.modules.system.controller.permission.vo.permission;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Collections;
+import java.util.Set;
+
+@ApiModel("赋予角色数据权限 Request VO")
+@Data
+public class SysPermissionAssignRoleDataScopeReqVO {
+
+    @ApiModelProperty(value = "角色编号", required = true, example = "1")
+    @NotNull(message = "角色编号不能为空")
+    private Long roleId;
+
+    @ApiModelProperty(value = "数据范围", required = true, example = "1", notes = "参见 SysDataScopeEnum 枚举类")
+    @NotNull(message = "数据范围不能为空")
+//    TODO 这里要多一个枚举校验
+    private Integer dataScope;
+
+    @ApiModelProperty(value = "部门编号列表", example = "1,3,5", notes = "只有范围类型为 DEPT_CUSTOM 时，该字段才需要")
+    private Set<Long> dataScopeDeptIds = Collections.emptySet(); // 兜底
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java

@@ -12,7 +12,7 @@ import java.util.Set;
 @Data
 public class SysPermissionAssignRoleMenuReqVO {
 
-    @ApiModelProperty(value = "角色名", required = true, example = "1")
+    @ApiModelProperty(value = "角色编号", required = true, example = "1")
     @NotNull(message = "角色编号不能为空")
     private Long roleId;
 

src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java

@@ -5,6 +5,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("角色分页 Request VO")
 @Data
@@ -14,7 +19,18 @@ public class SysRolePageReqVO extends PageParam {
     @ApiModelProperty(value = "角色名称", example = "芋道", notes = "模糊匹配")
     private String name;
 
+    @ApiModelProperty(value = "角色标识", example = "yudao", notes = "模糊匹配")
+    private String code;
+
     @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 SysCommonStatusEnum 枚举类")
     private Integer status;
 
+    @ApiModelProperty(value = "开始时间", example = "2020-10-24")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "2020-10-24")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
 }

src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.Set;
 
 @ApiModel("角色信息 Response VO")
 @Data
@@ -22,6 +23,9 @@ public class SysRoleRespVO extends SysRoleBaseVO {
     @ApiModelProperty(value = "数据范围", required = true, example = "1", notes = "参见 DataScopeEnum 枚举类")
     private Integer dataScope;
 
+    @ApiModelProperty(value = "数据范围(指定部门数组)", example = "1")
+    private Set<Long> dataScopeDeptIds;
+
     @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 SysCommonStatusEnum 枚举类")
     private Integer status;