tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: 通知公告开发

Browse Source 
通知公告开发
This commit is contained in:
Theo
2024-09-01 01:27:41 +08:00
parent 55ec7673fd
commit 8804480c67
27 changed files with 299 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/youlai/boot/system/service/NoticeService.java
View File

@@ -1,11 +1,11 @@
package com.youlai.system.service;
package com.youlai.boot.system.service;
import com.youlai.system.model.entity.Notice;
import com.youlai.system.model.form.NoticeForm;
import com.youlai.system.model.query.NoticeQuery;
import com.youlai.system.model.vo.NoticeVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.Notice;
import com.youlai.boot.system.model.form.NoticeForm;
import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticeVO;
/**
* 通知公告服务类
@@ -18,7 +18,7 @@ public interface NoticeService extends IService<Notice> {
/**
*通知公告分页列表
*
* @return
* @return 通知公告分页列表
*/
IPage<NoticeVO> getNoticePage(NoticeQuery queryParams);
@@ -26,7 +26,7 @@ public interface NoticeService extends IService<Notice> {
* 获取通知公告表单数据
*
* @param id 通知公告ID
* @return
* @return 通知公告表单对象
*/
NoticeForm getNoticeFormData(Long id);
@@ -34,7 +34,7 @@ public interface NoticeService extends IService<Notice> {
* 新增通知公告
*
* @param formData 通知公告表单对象
* @return
* @return 是否新增成功
*/
boolean saveNotice(NoticeForm formData);
@@ -43,7 +43,7 @@ public interface NoticeService extends IService<Notice> {
*
* @param id 通知公告ID
* @param formData 通知公告表单对象
* @return
* @return 是否修改成功
*/
boolean updateNotice(Long id, NoticeForm formData);
@@ -51,8 +51,23 @@ public interface NoticeService extends IService<Notice> {
* 删除通知公告
*
* @param ids 通知公告ID，多个以英文逗号(,)分割
* @return
* @return 是否删除成功
*/
boolean deleteNotices(String ids);
/**
* 发布通知公告
*
* @param id 通知公告ID
* @return 是否发布成功
*/
boolean releaseNotice(Long id);
/**
* 撤回通知公告
*
* @param id 通知公告ID
* @return 是否撤回成功
*/
boolean recallNotice(Long id);
}

48
src/main/java/com/youlai/boot/system/service/NoticeStatusService.java
View File

@@ -1,11 +1,7 @@
package com.youlai.system.service;
package com.youlai.boot.system.service;
import com.youlai.system.model.entity.NoticeStatus;
import com.youlai.system.model.form.NoticeStatusForm;
import com.youlai.system.model.query.NoticeStatusQuery;
import com.youlai.system.model.vo.NoticeStatusVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.NoticeStatus;
/**
* 用户公告状态服务类
@@ -15,44 +11,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface NoticeStatusService extends IService<NoticeStatus> {
/**
*用户公告状态分页列表
*
* @return
*/
IPage<NoticeStatusVO> getNoticeStatusPage(NoticeStatusQuery queryParams);
/**
* 获取用户公告状态表单数据
*
* @param id 用户公告状态ID
* @return
*/
NoticeStatusForm getNoticeStatusFormData(Long id);
/**
* 新增用户公告状态
*
* @param formData 用户公告状态表单对象
* @return
*/
boolean saveNoticeStatus(NoticeStatusForm formData);
/**
* 修改用户公告状态
*
* @param id 用户公告状态ID
* @param formData 用户公告状态表单对象
* @return
*/
boolean updateNoticeStatus(Long id, NoticeStatusForm formData);
/**
* 删除用户公告状态
*
* @param ids 用户公告状态ID，多个以英文逗号(,)分割
* @return
*/
boolean deleteNoticeStatuss(String ids);
}

173
src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
View File

@@ -1,36 +1,34 @@
package com.youlai.system.service.impl;
package com.youlai.boot.system.service.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.google.gson.*;
import com.youlai.system.model.entity.NoticeStatus;
import com.youlai.system.model.entity.SysUser;
import com.youlai.system.security.util.SecurityUtils;
import com.youlai.system.service.NoticeStatusService;
import com.youlai.system.service.SysUserService;
import com.youlai.system.service.WebsocketService;
import jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.system.mapper.NoticeMapper;
import com.youlai.system.service.NoticeService;
import com.youlai.system.model.entity.Notice;
import com.youlai.system.model.form.NoticeForm;
import com.youlai.system.model.query.NoticeQuery;
import com.youlai.system.model.vo.NoticeVO;
import com.youlai.system.converter.NoticeConverter;
import com.google.gson.*;
import com.youlai.boot.common.constant.SymbolConstant;
import com.youlai.boot.core.security.util.SecurityUtils;
import com.youlai.boot.platform.websocket.service.WebsocketService;
import com.youlai.boot.system.converter.NoticeConverter;
import com.youlai.boot.system.mapper.NoticeMapper;
import com.youlai.boot.system.model.entity.Notice;
import com.youlai.boot.system.model.entity.NoticeStatus;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.form.NoticeForm;
import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticeVO;
import com.youlai.boot.system.service.NoticeService;
import com.youlai.boot.system.service.NoticeStatusService;
import com.youlai.boot.system.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
/**
* 通知公告服务实现类
@@ -44,11 +42,11 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
private final NoticeConverter noticeConverter;
private final WebsocketService webSocketServer;
private final WebsocketService websocketService;
private final NoticeStatusService noticeStatusService;
private final SysUserService sysUserService;
private final UserService userService;
private final Gson gson = new GsonBuilder()
.registerTypeAdapter(LocalDateTime.class, (JsonSerializer<LocalDateTime>) (localDateTime, type, jsonSerializationContext) ->
@@ -58,44 +56,29 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
.create();
private void sendWebSocketMsg(Notice notice) {
if (notice.getSendStatus() > 0) {
String jsonNotice = gson.toJson(noticeConverter.toVO(notice));
webSocketServer.sendStringToFrontend(SecurityUtils.getUsername(), jsonNotice);
List<SysUser> list = sysUserService.list();
for (SysUser sysUser : list) {
NoticeStatus noticeStatus = noticeStatusService.getOne(new LambdaQueryWrapper<NoticeStatus>().eq(NoticeStatus::getUserId, sysUser.getId()).eq(NoticeStatus::getNoticeId, notice.getId()));
if (noticeStatus == null) {
noticeStatus = new NoticeStatus();
noticeStatus.setUserId(sysUser.getId());
noticeStatus.setNoticeId(notice.getId());
noticeStatus.setReadStatus(0L);
noticeStatusService.save(noticeStatus);
}
}
}
String jsonNotice = gson.toJson(noticeConverter.toVO(notice));
websocketService.sendStringToFrontend(SecurityUtils.getUsername(), jsonNotice);
}
/**
* 获取通知公告分页列表
*
* @param queryParams 查询参数
* @return {@link IPage<NoticeVO>} 通知公告分页列表
* @return {@link IPage<NoticeVO>} 通知公告分页列表
*/
@Override
public IPage<NoticeVO> getNoticePage(NoticeQuery queryParams) {
Page<NoticeVO> pageVO = this.baseMapper.getNoticePage(
return this.baseMapper.getNoticePage(
new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams
);
return pageVO;
}
/**
* 获取通知公告表单数据
*
* @param id 通知公告ID
* @return
* @return {@link NoticeForm} 通知公告表单对象
*/
@Override
public NoticeForm getNoticeFormData(Long id) {
@@ -107,20 +90,15 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
* 新增通知公告
*
* @param formData 通知公告表单对象
* @return
* @return {@link Boolean} 是否新增成功
*/
@Override
public boolean saveNotice(NoticeForm formData) {
Notice entity = noticeConverter.toEntity(formData);
entity.setCreateBy(SecurityUtils.getUserId());
entity.setReleaseBy(SecurityUtils.getUserId());
entity.setUpdateBy(SecurityUtils.getUserId());
entity.setIsDelete(0);
boolean result = this.save(entity);
if (result) {
sendWebSocketMsg(entity);
if (entity.getTarType() == 1) {
Assert.notBlank(entity.getTarIds(), "指定用户不能为空");
}
return result;
return this.save(entity);
}
/**
@@ -128,36 +106,99 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
*
* @param id 通知公告ID
* @param formData 通知公告表单对象
* @return
* @return {@link Boolean} 是否更新成功
*/
@Override
public boolean updateNotice(Long id, NoticeForm formData) {
Notice entity = noticeConverter.toEntity(formData);
entity.setUpdateBy(SecurityUtils.getUserId());
entity.setIsDelete(0);
boolean result = this.updateById(entity);
if (result) {
sendWebSocketMsg(entity);
if (entity.getTarType() == 1) {
Assert.notBlank(entity.getTarIds(), "指定用户不能为空");
}
return result;
return this.updateById(entity);
}
/**
* 删除通知公告
*
* @param ids 通知公告ID，多个以英文逗号(,)分割
* @return
* @return {@link Boolean} 是否删除成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteNotices(String ids) {
Assert.isTrue(StrUtil.isNotBlank(ids), "删除的通知公告数据为空");
// 逻辑删除
List<Long> idList = Arrays.stream(ids.split(","))
List<Long> idList = Arrays.stream(ids.split(SymbolConstant.COMMA))
.map(Long::parseLong)
.toList();
LambdaUpdateWrapper<Notice> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(Notice::getId, idList).set(Notice::getIsDelete, 1);
return this.update(wrapper);
boolean b = this.removeByIds(idList);
if (b) {
//删除通知公告的同时，需要删除通知公告对应的用户通知状态
noticeStatusService.remove(new LambdaQueryWrapper<NoticeStatus>().in(NoticeStatus::getNoticeId, idList));
}
return true;
}
/**
* 发布通知公告
* @param id 通知公告ID
* @return 是否发布成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean releaseNotice(Long id) {
Notice notice = this.getById(id);
Assert.notNull(notice, "通知公告不存在");
Assert.isTrue(notice.getReleaseStatus() == 0, "通知公告已发布");
notice.setReleaseStatus(1);
notice.setReleaseTime(LocalDateTime.now());
this.updateById(notice);
//发布通知公告的同时，需要将通知公告发送给目标用户
//先删除掉该通知公告之前对应的用户信息
noticeStatusService.remove(new LambdaQueryWrapper<NoticeStatus>().eq(NoticeStatus::getNoticeId, id));
LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
if (notice.getTarType() == 1) {
Assert.notBlank(notice.getTarIds(), "指定用户不能为空");
queryWrapper.in(User::getId, Arrays.asList(notice.getTarIds().split(SymbolConstant.COMMA)));
}
//查询出目标用户，增加用户通知状态
List<User> list = userService.list(queryWrapper);
List<NoticeStatus> needSaveList = list.stream().map(user -> {
NoticeStatus noticeStatus = new NoticeStatus();
noticeStatus.setNoticeId(id);
noticeStatus.setUserId(user.getId());
noticeStatus.setReadStatus(0);
return noticeStatus;
}).toList();
if(needSaveList.size() > 0){
noticeStatusService.saveBatch(needSaveList);
}
//最后，给当前在线的用户发送websocket消息
//TODO: 通知公告的websocket消息发送
return this.updateById(notice);
}
/**
* 撤回通知公告
*
* @param id 通知公告ID
* @return 是否撤回成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean recallNotice(Long id) {
Notice notice = this.getById(id);
Assert.notNull(notice, "通知公告不存在");
Assert.isTrue(notice.getReleaseStatus() == 1, "通知公告未发布");
notice.setReleaseStatus(2);
notice.setRecallTime(LocalDateTime.now());
if (!this.updateById(notice)) {
return false;
}
//先删除掉该通知公告之前对应的用户信息
noticeStatusService.remove(new LambdaQueryWrapper<NoticeStatus>().eq(NoticeStatus::getNoticeId, id));
return true;
}
}

93
src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java
View File

@@ -1,24 +1,11 @@
package com.youlai.system.service.impl;
package com.youlai.boot.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.system.mapper.NoticeStatusMapper;
import com.youlai.boot.system.model.entity.NoticeStatus;
import com.youlai.boot.system.service.NoticeStatusService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.system.mapper.NoticeStatusMapper;
import com.youlai.system.service.NoticeStatusService;
import com.youlai.system.model.entity.NoticeStatus;
import com.youlai.system.model.form.NoticeStatusForm;
import com.youlai.system.model.query.NoticeStatusQuery;
import com.youlai.system.model.vo.NoticeStatusVO;
import com.youlai.system.converter.NoticeStatusConverter;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
/**
* 用户公告状态服务实现类
@@ -30,74 +17,4 @@ import cn.hutool.core.util.StrUtil;
@RequiredArgsConstructor
public class NoticeStatusServiceImpl extends ServiceImpl<NoticeStatusMapper, NoticeStatus> implements NoticeStatusService {
private final NoticeStatusConverter noticeStatusConverter;
/**
* 获取用户公告状态分页列表
*
* @param queryParams 查询参数
* @return {@link IPage<NoticeStatusVO>} 用户公告状态分页列表
*/
@Override
public IPage<NoticeStatusVO> getNoticeStatusPage(NoticeStatusQuery queryParams) {
Page<NoticeStatusVO> pageVO = this.baseMapper.getNoticeStatusPage(
new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams
);
return pageVO;
}
/**
* 获取用户公告状态表单数据
*
* @param id 用户公告状态ID
* @return
*/
@Override
public NoticeStatusForm getNoticeStatusFormData(Long id) {
NoticeStatus entity = this.getById(id);
return noticeStatusConverter.toForm(entity);
}
/**
* 新增用户公告状态
*
* @param formData 用户公告状态表单对象
* @return
*/
@Override
public boolean saveNoticeStatus(NoticeStatusForm formData) {
NoticeStatus entity = noticeStatusConverter.toEntity(formData);
return this.save(entity);
}
/**
* 更新用户公告状态
*
* @param id 用户公告状态ID
* @param formData 用户公告状态表单对象
* @return
*/
@Override
public boolean updateNoticeStatus(Long id,NoticeStatusForm formData) {
NoticeStatus entity = noticeStatusConverter.toEntity(formData);
return this.updateById(entity);
}
/**
* 删除用户公告状态
*
* @param ids 用户公告状态ID，多个以英文逗号(,)分割
* @return
*/
@Override
public boolean deleteNoticeStatuss(String ids) {
Assert.isTrue(StrUtil.isNotBlank(ids), "删除的用户公告状态数据为空");
// 逻辑删除
List<Long> idList = Arrays.stream(ids.split(","))
.map(Long::parseLong)
.toList();
return this.removeByIds(idList);
}
}