|
@@ -27,11 +27,18 @@ public class LifeMessageController {
|
|
|
|
|
|
|
|
@ApiOperation("消息列表")
|
|
@ApiOperation("消息列表")
|
|
|
@ApiOperationSupport(order = 1)
|
|
@ApiOperationSupport(order = 1)
|
|
|
- @ApiImplicitParams({@ApiImplicitParam(name = "receiverId", value = "当前登录人", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "friendType", value = "聊天类型 0-搜索 1-聊过 2-未聊过", dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "search", value = "搜索字段", dataType = "Integer", paramType = "query")})
|
|
|
|
|
|
|
+ @ApiImplicitParams(
|
|
|
|
|
+ {
|
|
|
|
|
+ @ApiImplicitParam(name = "receiverId", value = "当前登录人", dataType = "String", paramType = "query"),
|
|
|
|
|
+ @ApiImplicitParam(name = "friendType", value = "聊天类型 0-搜索 1-聊过 2-未聊过", dataType = "Integer", paramType = "query"),
|
|
|
|
|
+ @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String", paramType = "query"),
|
|
|
|
|
+ @ApiImplicitParam(name = "search", value = "搜索字段", dataType = "Integer", paramType = "query")
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
@GetMapping("/getMessageList")
|
|
@GetMapping("/getMessageList")
|
|
|
- public R<List<LifeMessageVo>> getMessageList(@RequestParam String receiverId, @RequestParam int friendType, String search) throws Exception {
|
|
|
|
|
|
|
+ public R<List<LifeMessageVo>> getMessageList(@RequestParam String receiverId, @RequestParam int friendType, String search, String userName) throws Exception {
|
|
|
log.info("LifeMessageController.getMessageList?receiverId={}, friendType={}, search={}", receiverId, friendType, search);
|
|
log.info("LifeMessageController.getMessageList?receiverId={}, friendType={}, search={}", receiverId, friendType, search);
|
|
|
- return R.data(lifeMessageService.getMessageList(receiverId, friendType, search));
|
|
|
|
|
|
|
+ return R.data(lifeMessageService.getMessageList(receiverId, friendType, search, userName));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation("未读消息与通知数量")
|
|
@ApiOperation("未读消息与通知数量")
|