Merge remote-tracking branch 'origin/master' into test

sys-api-service/src/main/java/com/xy/service/MsgUserMessageServiceImpl.java

@@ -83,6 +83,21 @@ public class MsgUserMessageServiceImpl extends ServiceImpl<MsgUserMessageMapper,
         return R.ok(count);
     }
 
+    @ApiOperation("我的消息-标记全部已读")
+    @Override
+    public R<Boolean> readAll() {
+        Long loginId = AuthorizeUtils.getLoginId(Long.class);
+        List<MsgUserMessage> list = this.list(Wrappers.<MsgUserMessage>lambdaQuery()
+                .eq(MsgUserMessage::getUserId, loginId)
+                .eq(MsgUserMessage::getReadState, MsgReadStatus.UN_READ.getCode()));
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(mum -> {
+                mum.setReadState(String.valueOf(MsgReadStatus.READ.getCode()));
+            });
+            this.saveOrUpdateBatch(list);
+        }
+        return R.ok(Boolean.TRUE);
+    }
 
     @ApiOperation("我的消息")
     @Override
@@ -92,7 +107,7 @@ public class MsgUserMessageServiceImpl extends ServiceImpl<MsgUserMessageMapper,
         LambdaQueryWrapper<MsgUserMessage> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, MsgUserMessage.class)
                 .ge(MsgUserMessage::getCreateTime, page.getBeginCreateTime())
                 .le(MsgUserMessage::getCreateTime, page.getEndCreateTime())
-                .build().orderByAsc(MsgUserMessage::getPriority);
+                .build().orderByDesc(MsgUserMessage::getCreateTime);
         IPage<MsgUserMessage> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         PageBean<MsgUserMessageDto.PageVO> pageVo = toPageBean(MsgUserMessageDto.PageVO.class, iPage);
         List<MsgUserMessageDto.PageVO> records = pageVo.getRecords();

sys-api/src/main/java/com/xy/service/MsgUserMessageService.java

@@ -25,6 +25,9 @@ public interface MsgUserMessageService {
     @PostMapping("unRead")
     R<Long> myMsgUnRead();
 
+    @PostMapping("readAll")
+    R<Boolean> readAll();
+
     @PostMapping("myMsg")
     R<PageBean<MsgUserMessageDto.PageVO>> myMsgPage(@RequestBody MsgUserMessageDto.Page page);