Commit fda0b871 authored by liuyang's avatar liuyang

update

parent 4ee69f40
...@@ -33,21 +33,21 @@ public class SysRoleController { ...@@ -33,21 +33,21 @@ public class SysRoleController {
*/ */
@ApiOperation("获取全部角色列表") @ApiOperation("获取全部角色列表")
@GetMapping("/select") @GetMapping("/select")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<List<SysRolePO>> select(){ public Result<List<SysRolePO>> select(){
return Result.succeed(sysRoleService.list()); return Result.succeed(sysRoleService.list());
} }
@ApiOperation("查询角色列表") @ApiOperation("查询角色列表")
@PostMapping("/list") @PostMapping("/list")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public PageResult<SysRolePO> list(@RequestBody QueryRoleModel queryRoleModel){ public PageResult<SysRolePO> list(@RequestBody QueryRoleModel queryRoleModel){
return sysRoleService.queryPageList(queryRoleModel); return sysRoleService.queryPageList(queryRoleModel);
} }
@ApiOperation("获取某一角色信息") @ApiOperation("获取某一角色信息")
@GetMapping("/info/{id}") @GetMapping("/info/{id}")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<SysRoleModel> info(@PathVariable Long id){ public Result<SysRoleModel> info(@PathVariable Long id){
return Result.succeed(sysRoleService.getRoleInfo(id)); return Result.succeed(sysRoleService.getRoleInfo(id));
} }
...@@ -55,7 +55,7 @@ public class SysRoleController { ...@@ -55,7 +55,7 @@ public class SysRoleController {
@ApiOperation("保存某一角色信息") @ApiOperation("保存某一角色信息")
@SysLog("保存某一角色信息") @SysLog("保存某一角色信息")
@PostMapping("/save") @PostMapping("/save")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<String> save(@RequestBody @Validated SysRoleModel sysRoleModel){ public Result<String> save(@RequestBody @Validated SysRoleModel sysRoleModel){
sysRoleService.saveRole(sysRoleModel); sysRoleService.saveRole(sysRoleModel);
return Result.succeed("ok"); return Result.succeed("ok");
...@@ -64,7 +64,7 @@ public class SysRoleController { ...@@ -64,7 +64,7 @@ public class SysRoleController {
@ApiOperation("修改某一角色信息") @ApiOperation("修改某一角色信息")
@SysLog("修改某一角色信息") @SysLog("修改某一角色信息")
@PostMapping("/update") @PostMapping("/update")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<String> update(@RequestBody @Validated SysRoleModel sysRoleModel){ public Result<String> update(@RequestBody @Validated SysRoleModel sysRoleModel){
sysRoleService.updateRole(sysRoleModel); sysRoleService.updateRole(sysRoleModel);
return Result.succeed("ok"); return Result.succeed("ok");
......
...@@ -64,7 +64,7 @@ public class SysUserController { ...@@ -64,7 +64,7 @@ public class SysUserController {
@ApiOperation("保存用户信息") @ApiOperation("保存用户信息")
@SysLog("保存用户信息") @SysLog("保存用户信息")
@PostMapping("/save") @PostMapping("/save")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<String> save(@RequestBody @Validated(AddGroup.class) SysUserModel sysUserModel){ public Result<String> save(@RequestBody @Validated(AddGroup.class) SysUserModel sysUserModel){
sysUserService.saveUser(sysUserModel); sysUserService.saveUser(sysUserModel);
return Result.succeed("ok"); return Result.succeed("ok");
...@@ -72,7 +72,7 @@ public class SysUserController { ...@@ -72,7 +72,7 @@ public class SysUserController {
@ApiOperation("修改用户信息") @ApiOperation("修改用户信息")
@SysLog("修改用户信息") @SysLog("修改用户信息")
@PostMapping("/update") @PostMapping("/update")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<String> update(@RequestBody @Validated(UpdateGroup.class) SysUserModel sysUserModel){ public Result<String> update(@RequestBody @Validated(UpdateGroup.class) SysUserModel sysUserModel){
sysUserService.updateUser(sysUserModel); sysUserService.updateUser(sysUserModel);
return Result.succeed("ok"); return Result.succeed("ok");
...@@ -97,7 +97,7 @@ public class SysUserController { ...@@ -97,7 +97,7 @@ public class SysUserController {
@ApiOperation("删除用户") @ApiOperation("删除用户")
@SysLog("删除用户") @SysLog("删除用户")
@PostMapping("/delete") @PostMapping("/delete")
@RequiresRoles(value = {BizConstants.ROLE_ADMIN}) @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
public Result<String> delete(@RequestBody Long[] userIds){ public Result<String> delete(@RequestBody Long[] userIds){
if(ArrayUtils.contains(userIds, 1L)){ if(ArrayUtils.contains(userIds, 1L)){
throw new BusinessException("系统管理员不能删除"); throw new BusinessException("系统管理员不能删除");
......
...@@ -83,6 +83,15 @@ public class MainPageController { ...@@ -83,6 +83,15 @@ public class MainPageController {
return Result.succeed(list); return Result.succeed(list);
} }
@ApiOperation("获取课程详情")
@GetMapping("/course/{id}")
@SysLog("获取课程详情")
public Result<CourseDetailModel> getCourseDetail(@PathVariable Long id){
// courseService.checkPerm(id);
CourseDetailModel model = courseService.getCourseDetail(id);
return Result.succeed(model);
}
@ApiOperation("获取教师信息") @ApiOperation("获取教师信息")
@GetMapping("/teacher/{teacherId}") @GetMapping("/teacher/{teacherId}")
@SysLog("获取教师信息") @SysLog("获取教师信息")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment