diff --git a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java index 0c0d7fc8..28061d89 100644 --- a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java +++ b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java @@ -17,7 +17,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -26,13 +25,13 @@ import java.util.Map; /** -* 通知管理 -* -* @author Mark sunlightcs@gmail.com -*/ + * 通知管理 + * + * @author Mark sunlightcs@gmail.com + */ @RestController @RequestMapping("sys/notice") -@Api(tags="通知管理") +@Api(tags = "通知管理") public class SysNoticeController { @Autowired private SysNoticeService sysNoticeService; @@ -42,13 +41,13 @@ public class SysNoticeController { @GetMapping("page") @ApiOperation("分页") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String") }) // @RequiresPermissions("sys:notice:all") - public Result> page(@ApiIgnore @RequestParam Map params){ + public Result> page(@ApiIgnore @RequestParam Map params) { PageData page = sysNoticeService.page(params); return new Result>().ok(page); @@ -57,13 +56,13 @@ public class SysNoticeController { @GetMapping("user/page") @ApiOperation("获取被通知的用户") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String"), + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"), }) // @RequiresPermissions("sys:notice:all") - public Result> userPage(@ApiIgnore @RequestParam Map params){ + public Result> userPage(@ApiIgnore @RequestParam Map params) { PageData page = sysNoticeService.getNoticeUserPage(params); return new Result>().ok(page); @@ -72,12 +71,12 @@ public class SysNoticeController { @GetMapping("mynotice/page") @ApiOperation("获取我的通知") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String"), + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"), }) - public Result> myNoticePage(@ApiIgnore @RequestParam Map params){ + public Result> myNoticePage(@ApiIgnore @RequestParam Map params) { PageData page = sysNoticeService.getMyNoticePage(params); return new Result>().ok(page); @@ -85,7 +84,7 @@ public class SysNoticeController { @PutMapping("mynotice/read/{noticeId}") @ApiOperation("标记我的通知为已读") - public Result read(@PathVariable("noticeId") Long noticeId){ + public Result read(@PathVariable("noticeId") Long noticeId) { sysNoticeUserService.updateReadStatus(SecurityUser.getUserId(), noticeId); return new Result(); @@ -93,7 +92,7 @@ public class SysNoticeController { @GetMapping("mynotice/unread") @ApiOperation("我的通知未读读") - public Result unRead(){ + public Result unRead() { int count = sysNoticeUserService.getUnReadNoticeCount(SecurityUser.getUserId()); return new Result().ok(count); @@ -102,7 +101,7 @@ public class SysNoticeController { @GetMapping("{id}") @ApiOperation("信息") // @RequiresPermissions("sys:notice:all") - public Result get(@PathVariable("id") Long id){ + public Result get(@PathVariable("id") Long id) { SysNoticeDTO data = sysNoticeService.get(id); return new Result().ok(data); @@ -112,7 +111,7 @@ public class SysNoticeController { @ApiOperation("保存") @LogOperation("保存") // @RequiresPermissions("sys:notice:all") - public Result save(@RequestBody SysNoticeDTO dto){ + public Result save(@RequestBody SysNoticeDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -125,7 +124,7 @@ public class SysNoticeController { @ApiOperation("修改") @LogOperation("修改") // @RequiresPermissions("sys:notice:all") - public Result update(@RequestBody SysNoticeDTO dto){ + public Result update(@RequestBody SysNoticeDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -138,7 +137,7 @@ public class SysNoticeController { @ApiOperation("删除") @LogOperation("删除") // @RequiresPermissions("sys:notice:all") - public Result delete(@RequestBody Long[] ids){ + public Result delete(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id");