|
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.validation.Valid;
|
|
|
import javax.validation.constraints.Max;
|
|
|
import javax.validation.constraints.Min;
|
|
|
import java.util.Map;
|
|
@@ -41,7 +42,6 @@ import java.util.Objects;
|
|
|
@Api(tags = "系统消息 Controller")
|
|
|
@RestController
|
|
|
@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_MESSAGE)
|
|
|
-@Validated
|
|
|
public class SysMessageController {
|
|
|
|
|
|
|
|
@@ -58,12 +58,12 @@ public class SysMessageController {
|
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "回执查询结果", response = SysMessageResult.class)})
|
|
|
public Result query(
|
|
|
- @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
|
|
|
+ @Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
|
|
|
@ApiParam(value = "区域城市", required = false) @RequestParam(required = false) String city,
|
|
|
@ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
|
|
|
@ApiParam(value = "回执状态", required = false) @RequestParam(required = false) Boolean status,
|
|
|
- @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
- @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
+ @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
+ @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
IPage<SysMessageResult> resultIPage = sysMessageService.query(new Page<>(pageNumber, pageSize),noticeId,city,supplierId,status);
|
|
|
return ResultUtil.ok(resultIPage);
|
|
|
}
|
|
@@ -71,7 +71,7 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "回执查询导出")
|
|
|
@RequestMapping(value = "/export", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
- public Result export(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
|
|
|
+ public Result export(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
|
|
|
@ApiParam(value = "区域城市", required = false) @RequestParam(required = false) String city,
|
|
|
@ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
|
|
|
@ApiParam(value = "回执状态", required = false) @RequestParam(required = false) Boolean status) throws Exception {
|
|
@@ -91,7 +91,7 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "回执统计已读和未读")
|
|
|
@RequestMapping(value = "/count", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageCountResult.class)})
|
|
|
- public Result count(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long noticeId) throws Exception {
|
|
|
+ public Result count(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long noticeId) throws Exception {
|
|
|
return ResultUtil.ok(sysMessageService.count(noticeId));
|
|
|
}
|
|
|
|
|
@@ -103,7 +103,7 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "标记消息已阅读")
|
|
|
@RequestMapping(value = "/read", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
- public Result read(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
+ public Result read(@Valid @ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
return ResultUtil.ok(sysMessageService.read(id));
|
|
|
}
|
|
|
|
|
@@ -114,7 +114,7 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "查看消息详细")
|
|
|
@RequestMapping(value = "/get", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessage.class)})
|
|
|
- public Result get(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
+ public Result get(@Valid @ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
return ResultUtil.ok(sysMessageService.getById(id));
|
|
|
}
|
|
|
|
|
@@ -123,7 +123,7 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "按多个类型统计当前用户未读消息")
|
|
|
@RequestMapping(value = "/countByTypes", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
- public Result countByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types) {
|
|
|
+ public Result countByTypes(@Valid @ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types) {
|
|
|
return ResultUtil.ok(sysMessageService.countByTypes(types));
|
|
|
}
|
|
|
|
|
@@ -132,15 +132,15 @@ public class SysMessageController {
|
|
|
@ApiOperation(value = "按多个类型查询当前用户未读消息")
|
|
|
@RequestMapping(value = "/pageByTypes", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageWorkResult.class)})
|
|
|
- public Result pageByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types,
|
|
|
+ public Result pageByTypes(@Valid @ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types,
|
|
|
@ApiParam(value = "是否已读", required = false) @RequestParam(required = false) Boolean status,
|
|
|
@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
|
|
|
@ApiParam(value = "客户名称(模糊查询)", required = false) @RequestParam(required = false) String custom,
|
|
|
@ApiParam(value = "内容模糊查询", required = false) @RequestParam(required = false) String query,
|
|
|
@ApiParam(value = "发送时间开始", required = false) @RequestParam(required = false) Long startTime,
|
|
|
@ApiParam(value = "发送时间结束", required = false) @RequestParam(required = false) Long endTime,
|
|
|
- @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
- @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
+ @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
+ @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
IPage<SysMessageWorkResult> resultIPage = sysMessageService.pageByTypes(new Page<>(pageNumber, pageSize),types,status,serviceId,custom,query,startTime,endTime);
|
|
|
return ResultUtil.ok(resultIPage);
|
|
|
}
|