1.新增公告列表
This commit is contained in:
@@ -6,6 +6,7 @@ import com.hula.common.domain.vo.req.IdReqVO;
|
||||
import com.hula.common.domain.vo.res.CursorPageBaseResp;
|
||||
import com.hula.common.domain.vo.res.GroupListVO;
|
||||
import com.hula.common.domain.vo.res.IdRespVO;
|
||||
import com.hula.core.chat.domain.entity.Announcements;
|
||||
import com.hula.core.chat.domain.entity.RoomGroup;
|
||||
import com.hula.core.chat.domain.vo.request.ChatMessageMemberReq;
|
||||
import com.hula.core.chat.domain.vo.request.GroupAddReq;
|
||||
@@ -158,6 +159,13 @@ public class RoomController {
|
||||
return ApiResult.success();
|
||||
}
|
||||
|
||||
@Operation(summary = "公告列表")
|
||||
@GetMapping("/announcement/list/{id}")
|
||||
public ApiResult<IPage<Announcements>> announcementList(@PathVariable("id") Long roomId, @RequestParam("current") Long current,@RequestParam("size") Long size){
|
||||
IPage<Announcements> page = new Page<>(current,size);
|
||||
return ApiResult.success(roomService.announcementList(RequestHolder.get().getUid(), roomId, page));
|
||||
}
|
||||
|
||||
@Operation(summary = "查看公告")
|
||||
@GetMapping("/announcement")
|
||||
public ApiResult announcement(ReadAnnouncementsParam param){
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.hula.common.domain.vo.req.CursorPageBaseReq;
|
||||
import com.hula.common.domain.vo.res.CursorPageBaseResp;
|
||||
import com.hula.common.domain.vo.res.GroupListVO;
|
||||
import com.hula.core.chat.domain.entity.Announcements;
|
||||
import com.hula.core.chat.domain.entity.RoomGroup;
|
||||
import com.hula.core.chat.domain.vo.request.ChatMessageMemberReq;
|
||||
import com.hula.core.chat.domain.vo.request.ContactFriendReq;
|
||||
@@ -27,6 +28,7 @@ import com.hula.core.chat.domain.vo.response.ChatRoomResp;
|
||||
import com.hula.core.chat.domain.vo.response.MemberResp;
|
||||
import com.hula.core.user.domain.vo.resp.ws.ChatMemberResp;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -90,6 +92,12 @@ public interface RoomAppService {
|
||||
*/
|
||||
Boolean pushAnnouncement(Long uid, AnnouncementsParam param);
|
||||
|
||||
/**
|
||||
* 获取公告列表
|
||||
* @return
|
||||
*/
|
||||
IPage<Announcements> announcementList(Long uid, Long roomId, IPage<Announcements> page);
|
||||
|
||||
/**
|
||||
* 已读公告
|
||||
*/
|
||||
|
||||
@@ -97,4 +97,6 @@ public interface RoomService {
|
||||
* 创建群成员
|
||||
*/
|
||||
void createGroupMember(Long groupId, Long uid);
|
||||
|
||||
IPage<Announcements> announcementList(Long uid, Long roomId, IPage<Announcements> page);
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ import org.springframework.data.redis.core.ZSetOperations;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
@@ -303,6 +304,11 @@ public class RoomAppServiceImpl implements RoomAppService {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<Announcements> announcementList(Long uid, Long roomId, IPage<Announcements> page) {
|
||||
return roomService.announcementList(uid, roomId, page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean readAnnouncement(Long uid, ReadAnnouncementsParam param) {
|
||||
// 1.更新已读状态
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.hula.common.domain.vo.res.GroupListVO;
|
||||
import com.hula.common.enums.NormalOrNoEnum;
|
||||
import com.hula.core.chat.dao.AnnouncementsDao;
|
||||
import com.hula.core.chat.dao.AnnouncementsReadRecordDao;
|
||||
import com.hula.core.chat.domain.entity.Announcements;
|
||||
@@ -202,4 +201,9 @@ public class RoomServiceImpl implements RoomService {
|
||||
groupMember.setUid(uid);
|
||||
groupMemberDao.save(groupMember);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<Announcements> announcementList(Long uid, Long roomId, IPage<Announcements> page) {
|
||||
return announcementsDao.getBaseMapper().selectPage(page, new QueryWrapper<Announcements>().eq("uid", uid).eq("room_id", roomId));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user