From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)

---
 src/main/java/org/springblade/modules/system/controller/RoleController.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/RoleController.java b/src/main/java/org/springblade/modules/system/controller/RoleController.java
index 95c20a3..0c6fcca 100644
--- a/src/main/java/org/springblade/modules/system/controller/RoleController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -56,7 +56,7 @@
 @AllArgsConstructor
 @RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/role")
 @Api(value = "角色", tags = "角色")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 public class RoleController extends BladeController {
 
 	private final IRoleService roleService;
@@ -70,6 +70,18 @@
 	public R<RoleVO> detail(Role role) {
 		Role detail = roleService.getOne(Condition.getQueryWrapper(role));
 		return R.data(RoleWrapper.build().entityVO(detail));
+	}
+
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/details")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入role")
+	public R<Role> details(Role role) {
+		Role detail = roleService.getOne(Condition.getQueryWrapper(role));
+		return R.data(detail);
 	}
 
 	/**
@@ -148,4 +160,11 @@
 		return R.status(temp);
 	}
 
+
+	@GetMapping("/selectRole")
+	public R selectRole() {
+		return R.data(roleService.selectRole());
+	}
+
+
 }

--
Gitblit v1.9.3