From 8782c057043b73dea58529333239fe1290b6e8e3 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Thu, 19 May 2022 20:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=A7=92=E8=89=B2=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ncst/award/controller/RoleController.java | 51 +++++++++++++++++++
 .../edu/ncst/award/model/system/Role.java     | 16 +++---
 2 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 awardBE/src/main/java/edu/ncst/award/controller/RoleController.java

diff --git a/awardBE/src/main/java/edu/ncst/award/controller/RoleController.java b/awardBE/src/main/java/edu/ncst/award/controller/RoleController.java
new file mode 100644
index 0000000..20cf73b
--- /dev/null
+++ b/awardBE/src/main/java/edu/ncst/award/controller/RoleController.java
@@ -0,0 +1,51 @@
+package edu.ncst.award.controller;
+
+import edu.ncst.award.common.core.page.TableDataInfo;
+import edu.ncst.award.model.system.Role;
+import edu.ncst.award.service.ISysRoleService;
+import edu.ncst.award.vo.ResultVO;
+import edu.ncst.award.vo.param.query.PageQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 角色信息
+ */
+@Api(value = "角色信息控制器", tags = {"角色信息管理"})
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/role")
+public abstract class RoleController {
+
+    private final ISysRoleService roleService;
+
+    /**
+     * 获取角色列表
+     */
+    @ApiOperation("获取角色列表")
+    @GetMapping("/list")
+    public TableDataInfo<Role> list(Role role, PageQuery pageQuery){
+        return roleService.selectPageRoleList(role,pageQuery);
+    }
+
+    // 增加权限
+    abstract ResultVO<Void> addAllRole();
+
+    // 分配权限
+    abstract ResultVO<Void> assignRole();
+
+    // 修改权限
+    abstract ResultVO<Void> updateByRoleId();
+
+    // 删除权限
+    abstract ResultVO<Void> deleteRoleByUserId();
+
+
+}
diff --git a/awardBE/src/main/java/edu/ncst/award/model/system/Role.java b/awardBE/src/main/java/edu/ncst/award/model/system/Role.java
index e236b01..c809f3d 100644
--- a/awardBE/src/main/java/edu/ncst/award/model/system/Role.java
+++ b/awardBE/src/main/java/edu/ncst/award/model/system/Role.java
@@ -1,9 +1,6 @@
 package edu.ncst.award.model.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import edu.ncst.award.common.constant.UserConstants;
 import edu.ncst.award.model.BaseEntity;
@@ -39,11 +36,18 @@ public class Role extends BaseEntity {
     private Boolean enable;
 
     @ApiModelProperty(value = "删除时间")
-    @TableLogic
+//    @TableLogic
     @JsonIgnore
     private Date deleteTime;
-    
+
+    @ApiModelProperty(value = "是否删除 2：删除 0：未删除")
+    @TableField("del_flag")
+    @TableLogic
+    private String delFlag;
+
+
     @ApiModelProperty(value = "是否是管理员")
+    @JsonIgnore
     public boolean isAdmin(){
         return UserConstants.ADMIN_ID.equals(this.roleId);
     }