auth/auth-server-java
auth
/
auth-server-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: auth:46f82370c4b6b96fc79899540430ef9765356cac
Branches Tags
auth:master
auth:dev
auth:master-v2
auth:master-v1
auth:v4.0.2
auth:v4.0.1
auth:v4.0.0
auth:v3.0.1
auth:v3.0.0
..
compare: auth:02321fbcb2b8a8e2f034be7873552e361958d4ad
Branches Tags
auth:master
auth:dev
auth:master-v2
auth:master-v1
auth:v4.0.2
auth:v4.0.1
auth:v4.0.0
auth:v3.0.1
auth:v3.0.0

No commits in common. "46f82370c4b6b96fc79899540430ef9765356cac" and "02321fbcb2b8a8e2f034be7873552e361958d4ad" have entirely different histories.
46f82370c4 ... 02321fbcb2

18 changed files with 373 additions and 744 deletions
Show Stats Expand all files Collapse all files

12
common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java
View File

@ -3,8 +3,10 @@ package cn.bunny.common.generator.generator;
import cn.bunny.common.generator.entity.BaseField;
import cn.bunny.common.generator.entity.BaseResultMap;
import cn.bunny.common.generator.utils.GeneratorCodeUtils;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.vo.system.message.MessageVo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.google.common.base.CaseFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@ -49,10 +51,10 @@ public class WebGeneratorCode {
public static void main(String[] args) throws Exception {
Class<?> originalClass = Message.class;
Class<?> dtoClass = MessageReceivedDto.class;
Class<?> addDtoClass = MessageReceivedDto.class;
// Class<?> updateDtoClass = MessageUpdateDto.class;
// Class<?> voClass = MessageVo.class;
Class<?> dtoClass = MessageDto.class;
Class<?> addDtoClass = MessageDto.class;
Class<?> updateDtoClass = MessageUpdateDto.class;
Class<?> voClass = MessageVo.class;
// 设置velocity资源加载器
Properties prop = new Properties();

14
dao/src/main/java/cn/bunny/dao/dto/system/message/MessageDto.java
View File

@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "MessageDto对象", title = "消息查询", description = "消息查询")
@Schema(name = "MessageDto对象", title = "系统消息", description = "系统消息")
public class MessageDto {
@Schema(name = "title", title = "消息标题")
@ -22,13 +22,19 @@ public class MessageDto {
@Schema(name = "messageType", title = "消息类型")
private String messageType;
@Schema(name = "content", title = "消息内容")
private String content;
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
@Schema(name = "level", title = "消息等级")
private String level;
@Schema(name = "extra", title = "消息等级详情")
private String extra;
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
}

39
dao/src/main/java/cn/bunny/dao/dto/system/message/MessageReceivedDto.java
View File

@ -1,39 +0,0 @@
package cn.bunny.dao.dto.system.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "MessageReceivedDto对象", title = "用户消息查询", description = "用户消息查询")
public class MessageReceivedDto {
@Schema(name = "title", title = "消息标题")
private String title;
@Schema(name = "sendNickname", title = "发送人用户昵称")
private String sendNickname;
@Schema(name = "messageType", title = "消息类型")
private String messageType;
@Schema(name = "level", title = "消息等级")
private String level;
@Schema(name = "extra", title = "消息等级详情")
private String extra;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
}

24
dao/src/main/java/cn/bunny/dao/dto/system/message/MessageReceivedUpdateDto.java
View File

@ -1,24 +0,0 @@
package cn.bunny.dao.dto.system.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "MessageReceivedDto对象", title = "用户消息查询", description = "用户消息查询")
public class MessageReceivedUpdateDto {
@Schema(name = "ids", title = "消息接受id")
private List<Long> ids;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
}

3
dao/src/main/java/cn/bunny/dao/dto/system/message/MessageUpdateDto.java
View File

@ -58,6 +58,9 @@ public class MessageUpdateDto {
@NotNull(message = "编辑器类型 不能为空")
private String editorType;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
@Schema(name = "level", title = "消息等级")
private String level;

45
dao/src/main/java/cn/bunny/dao/vo/system/message/MessageDetailVo.java
View File

@ -1,45 +0,0 @@
package cn.bunny.dao.vo.system.message;
import cn.bunny.dao.common.vo.BaseUserVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "MessageDetailVo对象", title = "系统消息详情返回内容", description = "系统消息详情返回内容")
public class MessageDetailVo extends BaseUserVo {
@Schema(name = "title", title = "消息标题")
private String title;
@Schema(name = "sendUserId", title = "发送人用户ID")
private Long sendUserId;
@Schema(name = "messageType", title = "sys:系统消息,user用户消息")
private String messageType;
@Schema(name = "cover", title = "封面")
private String cover;
@Schema(name = "summary", title = "消息简介")
private String summary;
@Schema(name = "content", title = "消息内容")
private String content;
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
@Schema(name = "level", title = "消息等级")
private String level;
@Schema(name = "extra", title = "消息等级详情")
private String extra;
@Schema(name = "sendNickname", title = "发送人昵称")
private String sendNickname;
}

76
dao/src/main/java/cn/bunny/dao/vo/system/message/MessageReceivedWithMessageVo.java
View File

@ -1,76 +0,0 @@
package cn.bunny.dao.vo.system.message;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Schema(name = "MessageReceivedWithMessageVo对象", title = "用户消息接收", description = "用户消息接收")
public class MessageReceivedWithMessageVo extends BaseUserVo {
@Schema(name = "id", title = "消息接受id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long id;
@Schema(name = "messageId", title = "消息id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long messageId;
@Schema(name = "receivedUserId", title = "接收人用户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private String receivedUserId;
@Schema(name = "receivedUserNickname", title = "接收人用户昵称")
private String receivedUserNickname;
@Schema(name = "messageTypeId", title = "消息类型id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private String messageTypeId;
@Schema(name = "messageType", title = "消息类型")
private String messageType;
@Schema(name = "title", title = "消息标题")
private String title;
@Schema(name = "sendUserId", title = "发送人用户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private Long sendUserId;
@Schema(name = "sendNickname", title = "发送人昵称")
private String sendNickname;
@Schema(name = "cover", title = "封面")
private String cover;
@Schema(name = "summary", title = "消息简介")
private String summary;
@Schema(name = "content", title = "消息内容")
private String content;
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
@Schema(name = "level", title = "消息等级")
private String level;
@Schema(name = "extra", title = "消息等级详情")
private String extra;
}

29
dao/src/main/java/cn/bunny/dao/vo/system/message/MessageVo.java
View File

@ -3,12 +3,11 @@ package cn.bunny.dao.vo.system.message;
import cn.bunny.dao.common.vo.BaseUserVo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@ -17,13 +16,11 @@ import java.util.List;
@Schema(name = "MessageVo对象", title = "系统消息返回内容", description = "系统消息返回内容")
public class MessageVo extends BaseUserVo {
@Schema(name = "receivedUserId", title = "接收人用户ID")
@Schema(name = "messageReceivedId", title = "用户消息表id")
@JsonProperty("id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private List<String> receivedUserId;
@Schema(name = "receivedUserNickname", title = "接收人用户昵称")
private List<String> receivedUserNickname;
private Long messageReceivedId;
@Schema(name = "title", title = "消息标题")
private String title;
@ -36,12 +33,16 @@ public class MessageVo extends BaseUserVo {
@Schema(name = "sendNickname", title = "发送人昵称")
private String sendNickname;
@Schema(name = "receivedUserId", title = "接收人用户ID")
private String receivedUserId;
@Schema(name = "receivedUserNickname", title = "接收人用户昵称")
private String receivedUserNickname;
@Schema(name = "messageTypeId", title = "消息类型id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JSONField(serializeUsing = ToStringSerializer.class)
private String messageTypeId;
@Schema(name = "messageType", title = "sys:系统消息,user用户消息")
@Schema(name = "messageType", title = "消息类型")
private String messageType;
@Schema(name = "cover", title = "封面")
@ -56,13 +57,13 @@ public class MessageVo extends BaseUserVo {
@Schema(name = "editorType", title = "编辑器类型")
private String editorType;
@Schema(name = "status", title = "0:未读 1:已读")
private Boolean status;
@Schema(name = "level", title = "消息等级")
private String level;
@Schema(name = "extra", title = "消息等级详情")
private String extra;
}
}

54
service/src/main/java/cn/bunny/services/controller/MessageController.java
View File

@ -1,21 +1,18 @@
package cn.bunny.services.controller;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageDetailVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageVo;
import cn.bunny.services.service.MessageService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
@ -38,7 +35,7 @@ public class MessageController {
@Autowired
private MessageService messageService;
@Operation(summary = "分页查询发送消息", description = "分页查询发送消息")
@Operation(summary = "分页查询消息", description = "分页查询消息")
@GetMapping("getMessageList/{page}/{limit}")
public Mono<Result<PageResult<MessageVo>>> getMessageList(
@Parameter(name = "page", description = "当前页", required = true)
@ -51,38 +48,37 @@ public class MessageController {
return Mono.just(Result.success(pageResult));
}
@Operation(summary = "分页查询用户消息", description = "分页查询用户消息")
@GetMapping("noManage/getUserMessageList/{page}/{limit}")
public Mono<Result<PageResult<MessageUserVo>>> getUserMessageList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@PathVariable("limit") Integer limit,
MessageUserDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageUserVo> pageResult = messageService.getUserMessageList(pageParams, dto);
return Mono.just(Result.success(pageResult));
}
@Operation(summary = "根据消息id查询消息详情", description = "根据消息id查询消息详情")
@GetMapping("noManage/getMessageDetailById")
public Mono<Result<MessageDetailVo>> getMessageDetailById(Long id) {
MessageDetailVo vo = messageService.getMessageDetailById(id);
public Mono<Result<MessageVo>> getMessageDetailById(Long id) {
MessageVo vo = messageService.getMessageDetailById(id);
return Mono.just(Result.success(vo));
}
@Operation(summary = "根据消息id获取接收人信息", description = "根据消息id获取接收人信息")
@GetMapping("noManage/getReceivedUserinfoByMessageId")
public Mono<Result<List<MessageReceivedWithUserVo>>> getReceivedUserinfoByMessageId(Long messageId) {
List<MessageReceivedWithUserVo> voList = messageService.getReceivedUserinfoByMessageId(messageId);
return Mono.just(Result.success(voList));
}
@Operation(summary = "添加系统消息", description = "添加系统消息")
@PostMapping("addMessage")
public Mono<Result<String>> addMessage(@Valid @RequestBody MessageAddDto dto) {
messageService.addMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
}
@Operation(summary = "更新系统消息", description = "更新系统消息")
@PutMapping("updateMessage")
public Mono<Result<String>> updateMessage(@Valid @RequestBody MessageUpdateDto dto) {
messageService.updateMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
}
@Operation(summary = "删除系统消息", description = "删除系统消息")
@DeleteMapping("deleteMessage")
public Mono<Result<String>> deleteMessage(@RequestBody List<Long> ids) {
messageService.deleteMessage(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
}
@Operation(summary = "用户删除消息", description = "用户删除消息")
@DeleteMapping("noManage/deleteUserMessageByIds")
public Mono<Result<String>> deleteUserMessageByIds(@RequestBody List<Long> ids) {
messageService.deleteUserMessageByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
}
}

76
service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java
View File

@ -1,18 +1,12 @@
package cn.bunny.services.controller;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.pojo.result.Result;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.services.service.MessageReceivedService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,57 +31,31 @@ public class MessageReceivedController {
@Autowired
private MessageReceivedService messageReceivedService;
@Operation(summary = "管理员管理用户消息接收分页查询", description = "管理员管理用户消息接收分页查询")
@GetMapping("getMessageReceivedList/{page}/{limit}")
public Mono<Result<PageResult<MessageReceivedWithMessageVo>>> getMessageReceivedList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@PathVariable("limit") Integer limit,
MessageReceivedDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageReceivedWithMessageVo> pageResult = messageReceivedService.getMessageReceivedList(pageParams, dto);
return Mono.just(Result.success(pageResult));
@Operation(summary = "根据消息id获取接收人信息", description = "根据消息id获取接收人信息")
@GetMapping("noManage/getReceivedUserinfoByMessageId")
public Mono<Result<List<MessageReceivedWithUserVo>>> getReceivedUserinfoByMessageId(Long messageId) {
List<MessageReceivedWithUserVo> voList = messageReceivedService.getReceivedUserinfoByMessageId(messageId);
return Mono.just(Result.success(voList));
}
@Operation(summary = "管理员将用户接受消息标为已读", description = "管理员将用户接受消息标为已读")
@PutMapping("updateMarkMessageReceived")
public Mono<Result<String>> updateMarkMessageReceived(@Valid @RequestBody MessageReceivedUpdateDto dto) {
messageReceivedService.updateMarkMessageReceived(dto);
return Mono.just(Result.success());
@Operation(summary = "添加系统消息", description = "添加系统消息")
@PostMapping("addMessage")
public Mono<Result<String>> addMessage(@Valid @RequestBody MessageAddDto dto) {
messageReceivedService.addMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
}
@Operation(summary = "管理删除用户接受的消息", description = "管理删除用户接受的消息")
@DeleteMapping("deleteMessageReceivedByIds")
public Mono<Result<String>> deleteMessageReceivedByIds(@RequestBody List<Long> ids) {
messageReceivedService.deleteMessageReceivedByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
}
@Operation(summary = "分页查询用户消息", description = "分页查询用户消息")
@GetMapping("noManage/getUserMessageList/{page}/{limit}")
public Mono<Result<PageResult<MessageUserVo>>> getUserMessageList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@PathVariable("limit") Integer limit,
MessageUserDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageUserVo> pageResult = messageReceivedService.getUserMessageList(pageParams, dto);
return Mono.just(Result.success(pageResult));
}
@Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读")
@PutMapping("noManage/userMarkAsRead")
public Mono<Result<String>> userMarkAsRead(@Valid @RequestBody List<Long> ids) {
messageReceivedService.userMarkAsRead(ids);
@Operation(summary = "更新系统消息", description = "更新系统消息")
@PutMapping("updateMessage")
public Mono<Result<String>> updateMessage(@Valid @RequestBody MessageUpdateDto dto) {
messageReceivedService.updateMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
}
@Operation(summary = "用户删除消息", description = "用户删除消息")
@DeleteMapping("noManage/deleteUserMessageByIds")
public Mono<Result<String>> deleteUserMessageByIds(@RequestBody List<Long> ids) {
messageReceivedService.deleteUserMessageByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
@Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读")
@PutMapping("noManage/updateUserMarkAsRead")
public Mono<Result<String>> updateUserMarkAsRead(@Valid @RequestBody List<Long> ids) {
messageReceivedService.updateUserMarkAsRead(ids);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
}
}

42
service/src/main/java/cn/bunny/services/mapper/MessageMapper.java
View File

@ -1,14 +1,14 @@
package cn.bunny.services.mapper;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.vo.system.message.MessageDetailVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.dao.vo.system.message.MessageVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -24,20 +24,13 @@ import java.util.List;
public interface MessageMapper extends BaseMapper<Message> {
/**
* 根据消息id查询消息详情
* * 分页查询系统消息内容
*
* @param id 消息id
* @return 消息返回对象
* @param pageParams 系统消息分页参数
* @param dto 系统消息查询表单
* @return 系统消息分页结果
*/
MessageDetailVo selectMessageVoById(Long id);
/**
* 根据消息id获取接收人信息
*
* @param messageId 消息id
* @return 消息接收人用户名等信息
*/
List<MessageReceivedWithUserVo> selectUserinfoListByMessageId(Long messageId);
IPage<MessageVo> selectListByPage(@Param("page") Page<Message> pageParams, @Param("dto") MessageDto dto);
/**
* 物理删除系统消息
@ -47,11 +40,20 @@ public interface MessageMapper extends BaseMapper<Message> {
void deleteBatchIdsWithPhysics(List<Long> ids);
/**
* 分页查询发送消息
* 根据消息所有包含匹配当前消息Id的列表
*
* @param pageParams 分页参数
* @param dto 查询表单
* @return 系统消息返回列表
* @param pageParams 系统消息分页参数
* @param dto 系统消息查询表单
* @return 系统消息分页结果
*/
IPage<MessageReceivedWithMessageVo> selectListByPage(Page<Message> pageParams, MessageDto dto);
IPage<MessageVo> selectListByPageWithMessageUserDto(@Param("page") Page<Message> pageParams, @Param("dto") MessageUserDto dto, @Param("userId") Long userId);
/**
* 根据消息id查询消息详情
*
* @param id 消息id
* @return 消息返回对象
*/
MessageVo selectMessageVoById(Long id);
}

39
service/src/main/java/cn/bunny/services/mapper/MessageReceivedMapper.java
View File

@ -1,16 +1,9 @@
package cn.bunny.services.mapper;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.entity.system.MessageReceived;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -25,30 +18,12 @@ import java.util.List;
@Mapper
public interface MessageReceivedMapper extends BaseMapper<MessageReceived> {
/**
* * 用户消息接收管理分页查询
*
* @param pageParams 系统消息分页参数
* @param dto 系统消息查询表单
* @return 系统消息分页结果
*/
IPage<MessageReceivedWithMessageVo> selectListByMessageReceivedPage(@Param("page") Page<Message> pageParams, @Param("dto") MessageReceivedDto dto);
/**
* 根据id批量删除
*
* @param ids 主键ids
* @param userIds 发送用户ID
*/
void deleteBatchIdsWithPhysics(List<Long> ids);
/**
* 根据消息所有包含匹配当前消息Id的列表
*
* @param pageParams 系统消息分页参数
* @param dto 系统消息查询表单
* @return 系统消息分页结果
*/
IPage<MessageUserVo> selectListByUserMessagePage(@Param("page") Page<Message> pageParams, @Param("dto") MessageUserDto dto, @Param("userId") Long userId);
void deleteBatchIdsWithPhysics(List<Long> userIds);
/**
* 根据消息Id物理删除
@ -56,4 +31,12 @@ public interface MessageReceivedMapper extends BaseMapper<MessageReceived> {
* @param ids 消息id
*/
void deleteBatchIdsByMessageIdsWithPhysics(List<Long> ids);
/**
* 根据发送者id批量删除
*
* @param messageId 消息id
* @return 消息接收人用户名等信息
*/
List<MessageReceivedWithUserVo> selectUserinfoListByMessageId(Long messageId);
}

47
service/src/main/java/cn/bunny/services/service/MessageReceivedService.java
View File

@ -1,14 +1,9 @@
package cn.bunny.services.service;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.MessageReceived;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
@ -25,46 +20,38 @@ import java.util.List;
public interface MessageReceivedService extends IService<MessageReceived> {
/**
* 管理员管理用户消息接收分页查询
* 根据发送者id批量删除消息接受者
*
* @return 系统消息返回列表
* @param sendUserIds 发送用户ID
*/
PageResult<MessageReceivedWithMessageVo> getMessageReceivedList(Page<Message> pageParams, MessageReceivedDto dto);
void deleteBatchIdsWithPhysics(List<Long> sendUserIds);
/**
* 管理员将用户接受消息标为已读
* 根据消息id获取接收人信息
*
* @param dto 用户消息表单
* @param messageId 消息id
* @return 消息接收人用户名等信息
*/
void updateMarkMessageReceived(@Valid MessageReceivedUpdateDto dto);
List<MessageReceivedWithUserVo> getReceivedUserinfoByMessageId(Long messageId);
/**
* 管理删除用户接受的消息
* * 添加系统消息
*
* @param ids 用户消息Id列表
* @param dto 添加表单
*/
void deleteMessageReceivedByIds(List<Long> ids);
/**
* 分页查询用户消息
*
* @param pageParams 系统消息返回列表
* @param dto 查询表单
* @return 分页结果
*/
PageResult<MessageUserVo> getUserMessageList(Page<Message> pageParams, MessageUserDto dto);
void addMessage(@Valid MessageAddDto dto);
/**
* 用户将消息标为已读
*
* @param ids 消息id列表
*/
void userMarkAsRead(List<Long> ids);
void updateUserMarkAsRead(List<Long> ids);
/**
* 用户删除消息
* * 更新系统消息
*
* @param ids 消息Id列表
* @param dto 更新表单
*/
void deleteUserMessageByIds(List<Long> ids);
void updateMessage(@Valid MessageUpdateDto dto);
}

59
service/src/main/java/cn/bunny/services/service/MessageService.java
View File

@ -1,16 +1,13 @@
package cn.bunny.services.service;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.vo.system.message.MessageDetailVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
import java.util.List;
@ -25,34 +22,11 @@ import java.util.List;
public interface MessageService extends IService<Message> {
/**
* 根据消息id获取接收人信息
* * 获取系统消息列表
*
* @param messageId 消息id
* @return 消息接收人用户名等信息
* @return 系统消息返回列表
*/
List<MessageReceivedWithUserVo> getReceivedUserinfoByMessageId(Long messageId);
/**
* 根据消息id查询消息详情
*
* @param id 消息id
* @return 消息详情
*/
MessageDetailVo getMessageDetailById(Long id);
/**
* * 添加系统消息
*
* @param dto 添加表单
*/
void addMessage(@Valid MessageAddDto dto);
/**
* * 更新系统消息
*
* @param dto 更新表单
*/
void updateMessage(@Valid MessageUpdateDto dto);
PageResult<MessageVo> getMessageList(Page<Message> pageParams, MessageDto dto);
/**
* * 删除|批量删除系统消息类型
@ -62,11 +36,26 @@ public interface MessageService extends IService<Message> {
void deleteMessage(List<Long> ids);
/**
* 分页查询发送消息
* 分页查询用户消息
*
* @param pageParams 分页参数
* @param pageParams 系统消息返回列表
* @param dto 查询表单
* @return 系统消息返回列表
* @return 分页结果
*/
PageResult<MessageVo> getMessageList(Page<Message> pageParams, MessageDto dto);
PageResult<MessageUserVo> getUserMessageList(Page<Message> pageParams, MessageUserDto dto);
/**
* 根据消息id查询消息详情
*
* @param id 消息id
* @return 消息详情
*/
MessageVo getMessageDetailById(Long id);
/**
* 用户删除消息
*
* @param ids 消息Id列表
*/
void deleteUserMessageByIds(List<Long> ids);
}

181
service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java
View File

@ -2,21 +2,18 @@ package cn.bunny.services.service.impl;
import cn.bunny.common.service.context.BaseContext;
import cn.bunny.common.service.exception.BunnyException;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.common.entity.BaseEntity;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.entity.system.MessageReceived;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.services.factory.UserFactory;
import cn.bunny.services.mapper.MessageMapper;
import cn.bunny.services.mapper.MessageReceivedMapper;
import cn.bunny.services.mapper.UserMapper;
import cn.bunny.services.service.MessageReceivedService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
@ -38,89 +35,116 @@ import java.util.List;
@Transactional
public class MessageReceivedServiceImpl extends ServiceImpl<MessageReceivedMapper, MessageReceived> implements MessageReceivedService {
@Autowired
private UserMapper userMapper;
@Autowired
private MessageMapper messageMapper;
@Autowired
private UserFactory userFactory;
/**
* 管理员管理用户消息接收分页查询
* 根据消息id获取接收人信息
*
* @param pageParams 系统消息分页查询page对象
* @param dto 系统消息分页查询对象
* @return 查询分页系统消息返回对象
* @param messageId 消息id
* @return 消息接收人用户名等信息
*/
@Override
public PageResult<MessageReceivedWithMessageVo> getMessageReceivedList(Page<Message> pageParams, MessageReceivedDto dto) {
// 分页查询消息数据
IPage<MessageReceivedWithMessageVo> page = baseMapper.selectListByMessageReceivedPage(pageParams, dto);
List<MessageReceivedWithMessageVo> voList = page.getRecords().stream().map(messageVo -> {
MessageReceivedWithMessageVo vo = new MessageReceivedWithMessageVo();
BeanUtils.copyProperties(messageVo, vo);
// 设置封面返回内容
String cover = vo.getCover();
cover = userFactory.checkGetUserAvatar(cover);
vo.setCover(cover);
return vo;
}).toList();
return PageResult.<MessageReceivedWithMessageVo>builder().list(voList).pageNo(page.getCurrent())
.pageSize(page.getSize()).total(page.getTotal())
.build();
public List<MessageReceivedWithUserVo> getReceivedUserinfoByMessageId(Long messageId) {
if (messageId == null) {
throw new BunnyException(ResultCodeEnum.REQUEST_IS_EMPTY);
}
return baseMapper.selectUserinfoListByMessageId(messageId);
}
/**
* 管理员将用户接受消息标为已读
* 添加系统消息
* 判断发送消息的接收人是否为空，如果为空默认是所有用户都是接受者
* 之后要将消息的接受者要保存在，消息接收表中，在这之前是没有消息id的
* 先要保存消息内容，之后获取到保存消息的id
* 将消息的id和接收者的id构建成map插入到消息接收表中
*
* @param dto 用户消息表单
* @param dto 系统消息添加
*/
@Override
public void updateMarkMessageReceived(@Valid MessageReceivedUpdateDto dto) {
List<MessageReceived> messageReceivedList = dto.getIds().stream().map(id -> {
public void addMessage(@Valid MessageAddDto dto) {
// 如果发送人为空设置当前登录的人的ID
if (dto.getSendUserId() == null) dto.setSendUserId(BaseContext.getUserId());
// 设置封面返回内容
String cover = dto.getCover();
dto.setCover(userFactory.checkGetUserAvatar(cover));
// 先保存消息数据，之后拿到保存消息的id
Message message = new Message();
BeanUtils.copyProperties(dto, message);
message.setMessageType(dto.getMessageTypeId().toString());
messageMapper.insert(message);
// 如果接收人为空默认接收全部人
List<Long> receivedUserIds = dto.getReceivedUserIds();
if (receivedUserIds.isEmpty()) {
receivedUserIds = userMapper.selectList(null).stream().map(BaseEntity::getId).toList();
}
// 从之前保存的消息中获取消息id，保存到消息接收表中
List<MessageReceived> receivedList = receivedUserIds.stream().map(id -> {
MessageReceived messageReceived = new MessageReceived();
messageReceived.setId(id);
messageReceived.setStatus(dto.getStatus());
messageReceived.setMessageId(message.getId());
messageReceived.setReceivedUserId(id);
messageReceived.setStatus(false);
return messageReceived;
}).toList();
updateBatchById(messageReceivedList);
saveBatch(receivedList);
}
/**
* 管理删除用户接受的消息
*
* @param ids 用户消息Id列表
*/
@Override
public void deleteMessageReceivedByIds(List<Long> ids) {
baseMapper.deleteBatchIdsWithPhysics(ids);
}
/**
* 分页查询用户消息
* 查询用户消息关系表，找到当前用户所有的消息
* 拿到用户消息关系表中数据只要MessageId
* 根据MessageId分页查询消息表
* 更新系统消息
*
* @param pageParams 系统消息返回列表
* @param dto 用户消息查询内容
* @return 分页结果
* @param dto 系统消息更新
*/
@Override
public PageResult<MessageUserVo> getUserMessageList(Page<Message> pageParams, MessageUserDto dto) {
// 根据消息所有包含匹配当前消息Id的列表
IPage<MessageUserVo> page = baseMapper.selectListByUserMessagePage(pageParams, dto, BaseContext.getUserId());
List<MessageUserVo> voList = page.getRecords().stream().map(messageVo -> {
MessageUserVo vo = new MessageUserVo();
BeanUtils.copyProperties(messageVo, vo);
public void updateMessage(@Valid MessageUpdateDto dto) {
// 如果发送人为空设置当前登录的人的ID
Long sendUserId = dto.getSendUserId();
if (sendUserId == null) dto.setSendUserId(BaseContext.getUserId());
// 设置封面返回内容
String cover = vo.getCover();
cover = userFactory.checkGetUserAvatar(cover);
vo.setCover(cover);
return vo;
// 如果接收人为空默认接收全部人
List<Long> receivedUserIds = dto.getReceivedUserIds();
if (receivedUserIds.isEmpty()) {
receivedUserIds = userMapper.selectList(null).stream().map(BaseEntity::getId).toList();
}
// 设置封面返回内容
String cover = dto.getCover();
dto.setCover(userFactory.checkGetUserAvatar(cover));
// 更新内容
Message message = new Message();
BeanUtils.copyProperties(dto, message);
message.setMessageType(dto.getMessageTypeId().toString());
messageMapper.updateById(message);
// 保存消息和用户之间关联数据
List<MessageReceived> receivedList = receivedUserIds.stream().map(id -> {
MessageReceived messageReceived = new MessageReceived();
messageReceived.setMessageId(dto.getId());
messageReceived.setReceivedUserId(id);
// 当更新的时当前消息用户表是否已读
if (id.equals(dto.getReceivedUserId())) {
messageReceived.setStatus(dto.getStatus());
}
return messageReceived;
}).toList();
return PageResult.<MessageUserVo>builder().list(voList).pageNo(page.getCurrent())
.pageSize(page.getSize()).total(page.getTotal())
.build();
// 删除这个消息id下所有用户消息关系内容
baseMapper.deleteBatchIdsByMessageIdsWithPhysics(List.of(dto.getId()));
// 插入接收者和消息表
saveBatch(receivedList);
}
/**
@ -130,7 +154,7 @@ public class MessageReceivedServiceImpl extends ServiceImpl<MessageReceivedMappe
* @param ids 消息id列表
*/
@Override
public void userMarkAsRead(List<Long> ids) {
public void updateUserMarkAsRead(List<Long> ids) {
// 判断ids是否为空
if (ids.isEmpty()) {
throw new BunnyException(ResultCodeEnum.REQUEST_IS_EMPTY);
@ -148,27 +172,12 @@ public class MessageReceivedServiceImpl extends ServiceImpl<MessageReceivedMappe
}
/**
* 用户删除消息
* 根据发送者id批量删除消息接受者
*
* @param ids 消息Id列表
* @param sendUserIds 发送用户ID
*/
@Override
public void deleteUserMessageByIds(List<Long> ids) {
// 判断ids是否为空
if (ids.isEmpty()) {
throw new BunnyException(ResultCodeEnum.REQUEST_IS_EMPTY);
}
// 判断删除的是否是自己的消息
List<MessageReceived> messageReceivedList = list(Wrappers.<MessageReceived>lambdaQuery().in(MessageReceived::getReceivedUserId, ids));
messageReceivedList.forEach(messageReceived -> {
if (!messageReceived.getReceivedUserId().equals(BaseContext.getUserId())) {
throw new BunnyException(ResultCodeEnum.ILLEGAL_DATA_REQUEST);
}
});
// 根据当前用户id删除消息接受表中数据
baseMapper.deleteBatchIdsWithPhysics(ids);
public void deleteBatchIdsWithPhysics(List<Long> sendUserIds) {
baseMapper.deleteBatchIdsWithPhysics(sendUserIds);
}
}

194
service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java
View File

@ -2,38 +2,29 @@ package cn.bunny.services.service.impl;
import cn.bunny.common.service.context.BaseContext;
import cn.bunny.common.service.exception.BunnyException;
import cn.bunny.dao.common.entity.BaseEntity;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.entity.system.MessageReceived;
import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageDetailVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.dao.vo.system.message.MessageVo;
import cn.bunny.services.factory.UserFactory;
import cn.bunny.services.mapper.MessageMapper;
import cn.bunny.services.mapper.MessageReceivedMapper;
import cn.bunny.services.mapper.UserMapper;
import cn.bunny.services.service.MessageReceivedService;
import cn.bunny.services.service.MessageService;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -53,50 +44,62 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Autowired
private MessageReceivedMapper messageReceivedMapper;
@Autowired
private UserMapper userMapper;
@Autowired
private MessageReceivedService messageReceivedService;
/**
* 分页查询发送消息
* * 系统消息 服务实现类
*
* @param pageParams 分页参数
* @param dto 查询表单
* @return 系统消息返回列表
* @param pageParams 系统消息分页查询page对象
* @param dto 系统消息分页查询对象
* @return 查询分页系统消息返回对象
*/
@Override
public PageResult<MessageVo> getMessageList(Page<Message> pageParams, MessageDto dto) {
IPage<MessageReceivedWithMessageVo> page = baseMapper.selectListByPage(pageParams, dto);
List<MessageReceivedWithMessageVo> records = page.getRecords();
// 接受人昵称
Map<Long, List<String>> receivedUserNicknameMap = records.stream()
.collect(Collectors.groupingBy(
MessageReceivedWithMessageVo::getId,
Collectors.mapping(MessageReceivedWithMessageVo::getReceivedUserNickname, Collectors.toList())));
// 接收人id
Map<Long, List<String>> receivedUserIdMap = records.stream()
.collect(Collectors.groupingBy(
MessageReceivedWithMessageVo::getId,
Collectors.mapping(messageWithMessageReceivedVo -> messageWithMessageReceivedVo.getId().toString(), Collectors.toList())));
List<MessageVo> voList = records.stream()
.map(messageWithMessageReceivedVo -> {
MessageVo messageVo = new MessageVo();
BeanUtils.copyProperties(messageWithMessageReceivedVo, messageVo);
messageVo.setReceivedUserNickname(receivedUserNicknameMap.get(messageWithMessageReceivedVo.getId()));
messageVo.setReceivedUserId(receivedUserIdMap.get(messageWithMessageReceivedVo.getId()));
return messageVo;
}).distinct().toList();
// 分页查询消息数据
IPage<MessageVo> page = baseMapper.selectListByPage(pageParams, dto);
List<MessageVo> voList = page.getRecords().stream().map(messageVo -> {
MessageVo vo = new MessageVo();
BeanUtils.copyProperties(messageVo, vo);
// 设置封面返回内容
String cover = vo.getCover();
cover = userFactory.checkGetUserAvatar(cover);
vo.setCover(cover);
return vo;
}).toList();
return PageResult.<MessageVo>builder().list(voList).pageNo(page.getCurrent())
.pageSize(page.getSize()).total(page.getTotal())
.build();
}
/**
* 分页查询用户消息
* 查询用户消息关系表，找到当前用户所有的消息
* 拿到用户消息关系表中数据只要MessageId
* 根据MessageId分页查询消息表
*
* @param pageParams 系统消息返回列表
* @param dto 用户消息查询内容
* @return 分页结果
*/
@Override
public PageResult<MessageUserVo> getUserMessageList(Page<Message> pageParams, MessageUserDto dto) {
// 根据消息所有包含匹配当前消息Id的列表
IPage<MessageVo> page = baseMapper.selectListByPageWithMessageUserDto(pageParams, dto, BaseContext.getUserId());
List<MessageUserVo> voList = page.getRecords().stream().map(messageVo -> {
MessageUserVo vo = new MessageUserVo();
BeanUtils.copyProperties(messageVo, vo);
// 设置封面返回内容
String cover = vo.getCover();
cover = userFactory.checkGetUserAvatar(cover);
vo.setCover(cover);
return vo;
}).toList();
return PageResult.<MessageUserVo>builder().list(voList).pageNo(page.getCurrent())
.pageSize(page.getSize()).total(page.getTotal())
.build();
}
/**
* 根据消息id查询消息详情
* 请求消息内容后标为已读
@ -105,7 +108,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
* @return 消息详情
*/
@Override
public MessageDetailVo getMessageDetailById(Long id) {
public MessageVo getMessageDetailById(Long id) {
// 将消息设为已读
MessageReceived messageReceived = new MessageReceived();
messageReceived.setReceivedUserId(BaseContext.getUserId());
@ -123,102 +126,19 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
}
/**
* 根据消息id获取接收人信息
* 用户删除消息
*
* @param messageId 消息id
* @return 消息接收人用户名等信息
* @param ids 消息Id列表
*/
@Override
public List<MessageReceivedWithUserVo> getReceivedUserinfoByMessageId(Long messageId) {
if (messageId == null) {
public void deleteUserMessageByIds(List<Long> ids) {
// 判断ids是否为空
if (ids.isEmpty()) {
throw new BunnyException(ResultCodeEnum.REQUEST_IS_EMPTY);
}
return baseMapper.selectUserinfoListByMessageId(messageId);
}
/**
* 添加系统消息
* 判断发送消息的接收人是否为空，如果为空默认是所有用户都是接受者
* 之后要将消息的接受者要保存在，消息接收表中，在这之前是没有消息id的
* 先要保存消息内容，之后获取到保存消息的id
* 将消息的id和接收者的id构建成map插入到消息接收表中
*
* @param dto 系统消息添加
*/
@Override
public void addMessage(@Valid MessageAddDto dto) {
// 如果发送人为空设置当前登录的人的ID
if (dto.getSendUserId() == null) dto.setSendUserId(BaseContext.getUserId());
// 设置封面返回内容
String cover = dto.getCover();
dto.setCover(userFactory.checkGetUserAvatar(cover));
// 先保存消息数据，之后拿到保存消息的id
Message message = new Message();
BeanUtils.copyProperties(dto, message);
message.setMessageType(dto.getMessageTypeId().toString());
save(message);
// 如果接收人为空默认接收全部人
List<Long> receivedUserIds = dto.getReceivedUserIds();
if (receivedUserIds.isEmpty()) {
receivedUserIds = userMapper.selectList(null).stream().map(BaseEntity::getId).toList();
}
// 从之前保存的消息中获取消息id，保存到消息接收表中
List<MessageReceived> receivedList = receivedUserIds.stream().map(id -> {
MessageReceived messageReceived = new MessageReceived();
messageReceived.setMessageId(message.getId());
messageReceived.setReceivedUserId(id);
messageReceived.setStatus(false);
return messageReceived;
}).toList();
messageReceivedService.saveBatch(receivedList);
}
/**
* 更新系统消息
*
* @param dto 系统消息更新
*/
@Override
public void updateMessage(@Valid MessageUpdateDto dto) {
// 如果发送人为空设置当前登录的人的ID
Long sendUserId = dto.getSendUserId();
if (sendUserId == null) dto.setSendUserId(BaseContext.getUserId());
// 如果接收人为空默认接收全部人
List<Long> receivedUserIds = dto.getReceivedUserIds();
if (receivedUserIds.isEmpty()) {
receivedUserIds = userMapper.selectList(null).stream().map(BaseEntity::getId).toList();
}
// 设置封面返回内容
String cover = dto.getCover();
dto.setCover(userFactory.checkGetUserAvatar(cover));
// 更新内容
Message message = new Message();
BeanUtils.copyProperties(dto, message);
message.setMessageType(dto.getMessageTypeId().toString());
baseMapper.updateById(message);
// 保存消息和用户之间关联数据
List<MessageReceived> receivedList = receivedUserIds.stream().map(id -> {
MessageReceived messageReceived = new MessageReceived();
messageReceived.setMessageId(dto.getId());
messageReceived.setReceivedUserId(id);
return messageReceived;
}).toList();
// 删除这个消息id下所有用户消息关系内容
messageReceivedMapper.deleteBatchIdsByMessageIdsWithPhysics(List.of(dto.getId()));
// 插入接收者和消息表
messageReceivedService.saveBatch(receivedList);
// 根据当前用户id删除消息接受表中数据
messageReceivedMapper.deleteBatchIdsWithPhysics(ids);
}
/**
@ -230,10 +150,10 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
*/
@Override
public void deleteMessage(List<Long> ids) {
// 根据消息id物理删除
// 物理删除消息表数据
baseMapper.deleteBatchIdsWithPhysics(ids);
// 根据消息Id物理删除用户消息表
// 根据消息Id物理删除接受者消息
messageReceivedMapper.deleteBatchIdsByMessageIdsWithPhysics(ids);
}
}

77
service/src/main/resources/mapper/MessageMapper.xml
View File

@ -26,8 +26,8 @@
id, create_time, update_time, create_user, update_user, is_deleted, title, send_user_id, message_type, content, cover, summary, editor_type, level,extra
</sql>
<!-- 分页查询发送消息 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo">
<!-- 分页查询系统消息内容 -->
<select id="selectListByPage" resultType="cn.bunny.dao.vo.system.message.MessageVo">
SELECT
message.id,
message.create_time,
@ -37,27 +37,29 @@
message.is_deleted,
message.title,
message.send_user_id,
send_user.nickname AS send_nickname,
message.content,
message.cover,
message.summary,
message.editor_type,
message.level,
message.extra,
message_received.status AS status,
message_received.received_user_id AS received_user_id,
message_received.id AS message_received_id,
message_type.message_name AS message_type,
message_type.id AS message_type_id,
received_user.nickname received_user_nickname,
create_user.username AS create_username,
update_user.username AS update_username
FROM sys_message message
LEFT JOIN sys_message_received message_received ON message.id = message_received.message_id
LEFT JOIN sys_message_type message_type ON message_type.id = message.message_type
LEFT JOIN sys_user create_user ON create_user.id = message_received.create_user
LEFT JOIN sys_user update_user ON update_user.id = message_received.update_user
LEFT JOIN sys_user received_user ON received_user.id = message_received.received_user_id
update_user.username AS update_username,
send_user.nickname AS send_nickname
FROM
sys_message message
LEFT JOIN sys_user create_user ON create_user.id = message.create_user
LEFT JOIN sys_user update_user ON update_user.id = message.update_user
LEFT JOIN sys_user send_user ON send_user.id = message.send_user_id
LEFT JOIN sys_message_received message_received ON message_received.message_id = message.id
LEFT JOIN sys_user received_user ON message_received.received_user_id = received_user.id
LEFT JOIN sys_message_type message_type ON message_type.id = message.message_type
<where>
message.is_deleted = 0
<if test="dto.title != null and dto.title != ''">
@ -67,7 +69,10 @@
and send_user.nickname like CONCAT('%',#{dto.sendNickname},'%')
</if>
<if test="dto.messageType != null and dto.messageType != ''">
and message_type.message_type = #{dto.messageType}
and message_type.message_type like CONCAT('%',#{dto.messageType},'%')
</if>
<if test="dto.content != null and dto.content != ''">
and message.content like CONCAT('%',#{dto.content},'%')
</if>
<if test="dto.editorType != null and dto.editorType != ''">
and message.editor_type = #{dto.editorType}
@ -78,11 +83,47 @@
<if test="dto.extra != null and dto.extra != ''">
and message.extra like CONCAT('%',#{dto.extra},'%')
</if>
<if test="dto.status != null">
and message_received.status = #{dto.status}
</if>
</where>
</select>
<!-- 根据消息所有包含匹配当前消息Id的列表 -->
<select id="selectListByPageWithMessageUserDto" resultType="cn.bunny.dao.vo.system.message.MessageVo">
SELECT
message.id,
message.title,
message.cover,
message.summary,
message.level,
message.extra,
message.update_time,
message_received.id AS message_received_id,
message_received.status AS status,
message_type.message_type AS message_type
FROM sys_message message
LEFT JOIN sys_user create_user ON create_user.id = message.create_user
LEFT JOIN sys_user update_user ON update_user.id = message.update_user
LEFT JOIN sys_message_type message_type ON message_type.id = message.message_type
INNER JOIN sys_message_received message_received ON message_received.received_user_id = #{userId}
AND message.id = message_received.message_id
<where>
message.is_deleted = 0
<if test="dto.status != null">
and message_received.status = #{dto.status}
</if>
<if test="dto.messageType != null and dto.messageType != ''">
and message_type.message_type = #{dto.messageType}
</if>
<if test="dto.title != null and dto.title != ''">
and message.title like CONCAT('%',#{dto.title},'%')
</if>
</where>
</select>
<!-- 根据消息id查询消息详情 -->
<select id="selectMessageVoById" resultType="cn.bunny.dao.vo.system.message.MessageDetailVo">
<select id="selectMessageVoById" resultType="cn.bunny.dao.vo.system.message.MessageVo">
SELECT message.*,
send_user.nickname AS send_nickname
FROM sys_message message
@ -102,16 +143,4 @@
</foreach>
</delete>
<!-- 根据消息id获取接收人信息 -->
<select id="selectUserinfoListByMessageId"
resultType="cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo">
SELECT message_received.message_id,
message_received.received_user_id,
USER.nickname,
USER.username
FROM sys_message_received message_received
LEFT JOIN sys_user user ON user.id = message_received.received_user_id
where message_received.message_id = #{messageId}
</select>
</mapper>

106
service/src/main/resources/mapper/MessageReceivedMapper.xml
View File

@ -14,73 +14,12 @@
id, received_user_id, message_id
</sql>
<!-- 用户消息接收管理分页查询 -->
<select id="selectListByMessageReceivedPage"
resultType="cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo">
SELECT
message_received.status AS status,
message_received.received_user_id AS received_user_id,
message_received.id AS id,
message.id as message_id,
message.create_time,
message.update_time,
message.create_user,
message.update_user,
message.is_deleted,
message.title,
message.send_user_id,
message.content,
message.cover,
message.summary,
message.editor_type,
message.level,
message.extra,
message_type.message_name AS message_type,
message_type.id AS message_type_id,
received_user.nickname received_user_nickname,
create_user.username AS create_username,
update_user.username AS update_username,
send_user.nickname AS send_nickname
FROM
sys_message_received message_received
LEFT JOIN sys_user create_user ON create_user.id = message_received.create_user
LEFT JOIN sys_user update_user ON update_user.id = message_received.update_user
LEFT JOIN sys_user received_user ON message_received.received_user_id = received_user.id
LEFT JOIN sys_message message ON message_received.message_id = message.id
LEFT JOIN sys_user send_user ON send_user.id = message.send_user_id
LEFT JOIN sys_message_type message_type ON message_type.id = message.message_type
<where>
message_received.is_deleted = 0
<if test="dto.title != null and dto.title != ''">
and message.title like CONCAT('%',#{dto.title},'%')
</if>
<if test="dto.sendNickname != null and dto.sendNickname != ''">
and send_user.nickname like CONCAT('%',#{dto.sendNickname},'%')
</if>
<if test="dto.messageType != null and dto.messageType != ''">
and message_type.message_type = #{dto.messageType}
</if>
<if test="dto.editorType != null and dto.editorType != ''">
and message.editor_type = #{dto.editorType}
</if>
<if test="dto.level != null and dto.level != ''">
and message.level = #{dto.level}
</if>
<if test="dto.extra != null and dto.extra != ''">
and message.extra like CONCAT('%',#{dto.extra},'%')
</if>
<if test="dto.status != null">
and message_received.status = #{dto.status}
</if>
</where>
</select>
<!-- 根据id批量删除 -->
<!-- 根据发送者id批量删除 -->
<delete id="deleteBatchIdsWithPhysics">
delete
from sys_message_received
where id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
<foreach collection="userIds" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</delete>
@ -95,37 +34,16 @@
</foreach>
</delete>
<!-- 根据消息所有包含匹配当前消息Id的列表 -->
<select id="selectListByUserMessagePage" resultType="cn.bunny.dao.vo.system.message.MessageUserVo">
SELECT
message.id,
message.title,
message.cover,
message.summary,
message.level,
message.extra,
message.update_time,
message_received.id AS message_received_id,
message_received.status AS status,
message_type.message_type AS message_type
FROM sys_message message
LEFT JOIN sys_user create_user ON create_user.id = message.create_user
LEFT JOIN sys_user update_user ON update_user.id = message.update_user
LEFT JOIN sys_message_type message_type ON message_type.id = message.message_type
INNER JOIN sys_message_received message_received ON message_received.received_user_id = #{userId}
AND message.id = message_received.message_id
<where>
message.is_deleted = 0
<if test="dto.status != null">
and message_received.status = #{dto.status}
</if>
<if test="dto.messageType != null and dto.messageType != ''">
and message_type.message_type = #{dto.messageType}
</if>
<if test="dto.title != null and dto.title != ''">
and message.title like CONCAT('%',#{dto.title},'%')
</if>
</where>
<!-- 根据发送者id批量删除消息接受者 -->
<select id="selectUserinfoListByMessageId"
resultType="cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo">
SELECT message_received.message_id,
message_received.received_user_id,
USER.nickname,
USER.username
FROM sys_message_received message_received
LEFT JOIN sys_user USER ON USER.id = message_received.received_user_id
where message_received.message_id = #{messageId}
</select>
</mapper>