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