|
@@ -21,14 +21,12 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
|
-import com.yonge.cooleshow.bbs.vo.BbsPrivateMessageVo;
|
|
|
import com.yonge.cooleshow.bbs.dto.search.BbsPrivateMessageSearch;
|
|
|
import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
|
|
|
import com.yonge.cooleshow.bbs.service.BbsPrivateMessageService;
|
|
|
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/bbsPrivateMessage")
|
|
@@ -56,7 +54,7 @@ public class BbsPrivateMessageController extends BaseController {
|
|
|
|
|
|
@PostMapping("/page/message")
|
|
|
@ApiOperation(value = "私信人员消息列表", notes = "传入bbsPrivateMessageSearch")
|
|
|
- public HttpResponseResult<PageInfo<BbsPrivateMessageDto>> pageMessage(@RequestBody @Valid BbsPrivateMessageSearch query) {
|
|
|
+ public HttpResponseResult<BbsPrivateMessageDto> pageMessage(@RequestBody @Valid BbsPrivateMessageSearch query) {
|
|
|
SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
if (user == null || user.getId() == null) {
|
|
|
throw new BizException("请重新登录");
|
|
@@ -65,17 +63,17 @@ public class BbsPrivateMessageController extends BaseController {
|
|
|
if (receiverUser == null || user.getId() == null) {
|
|
|
throw new BizException("私信接收方用户不存在");
|
|
|
}
|
|
|
+ BbsPrivateMessageDto bbsPrivateMessageDto = new BbsPrivateMessageDto();
|
|
|
query.setUserId(user.getId());
|
|
|
- IPage<BbsPrivateMessageDto> pages = bbsPrivateMessageService.selectMessagePage(PageUtil.getPage(query), query);
|
|
|
- List<BbsPrivateMessageDto> collect = pages.getRecords().stream().peek(bbsPrivateMessageDto -> {
|
|
|
- bbsPrivateMessageDto.setReceiverAvatar(receiverUser.getAvatar());
|
|
|
- bbsPrivateMessageDto.setReceiverName(receiverUser.getUsername());
|
|
|
- bbsPrivateMessageDto.setUserName(user.getUsername());
|
|
|
- bbsPrivateMessageDto.setUserAvatar(user.getAvatar());
|
|
|
-
|
|
|
- }).collect(Collectors.toList());
|
|
|
- pages.setRecords(collect);
|
|
|
- return succeed(PageUtil.pageInfo(pages));
|
|
|
+ IPage<BbsPrivateMessage> pages = bbsPrivateMessageService.selectReadMessagePage(PageUtil.getPage(query), query);
|
|
|
+ bbsPrivateMessageDto.setReadPage(PageUtil.pageInfo(pages));
|
|
|
+ bbsPrivateMessageDto.setReceiverAvatar(receiverUser.getAvatar());
|
|
|
+ bbsPrivateMessageDto.setReceiverName(receiverUser.getUsername());
|
|
|
+ bbsPrivateMessageDto.setUserName(user.getUsername());
|
|
|
+ bbsPrivateMessageDto.setUserAvatar(user.getAvatar());
|
|
|
+ List<BbsPrivateMessage> unreadMessage = bbsPrivateMessageService.selectUnreadMessage(query);
|
|
|
+ bbsPrivateMessageDto.setUnreadList(unreadMessage);
|
|
|
+ return succeed(bbsPrivateMessageDto);
|
|
|
}
|
|
|
|
|
|
|