sunhh 2 lat temu
rodzic
commit
ae4b657010

+ 6 - 0
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmVo.java

@@ -65,7 +65,13 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      */
     private Integer isLock;
 
+    /**
+     * 用户userID
+     */
     private List<String> userIds;
 
+    /**
+     * 状态:1未读;2已读
+     */
     private Integer status;
 }

+ 0 - 3
business-service/src/main/java/com/ozs/service/service/impl/MsgWebPushServiceImpl.java

@@ -98,11 +98,8 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 .doSelectPage(() -> msgWebPushMapper.messageMore(msgAlarmVo));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
-
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
-
-
         // Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
             List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {