DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

即时通信嵌入开发完成，期待下次开发将ui嵌入navbar中，以及完成拉起群聊以及群聊系统开发

Browse Source
This commit is contained in:
hdka
2024-10-29 16:46:27 +08:00
parent 7a73f4d2b5
commit 8662ce971d
21 changed files with 967 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/SocketContact.java
View File

@@ -25,7 +25,7 @@ public class SocketContact extends BaseEntity {
/**
* 通信id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 用户id
@@ -44,5 +44,9 @@ public class SocketContact extends BaseEntity {
* 备注
*/
private String remark;
/**
* 房间号
*/
private Long roomId;
}

56
ruoyi-system/src/main/java/com/ruoyi/system/domain/SocketMessage.java Normal file
View File

@@ -0,0 +1,56 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 对话信息对象 socket_message
*
* @author hdka
* @date 2024-10-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("socket_message")
public class SocketMessage extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 接收者id
*/
private Long contactId;
/**
* 发送者id
*/
private Long userId;
/**
* 发送信息内容
*/
private String content;
/**
* 房间号（针对群聊开发）
*/
private Long roomId;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 备注
*/
private String remark;
}

11
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SocketContactBo.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -42,11 +44,18 @@ public class SocketContactBo extends BaseEntity {
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/** 用户名 */
private String userName;
/**
* 房间号
*/
@NotNull(message = "房间号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long roomId;
private List<SysUser> userList;
}

63
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SocketMessageBo.java Normal file
View File

@@ -0,0 +1,63 @@
package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 对话信息业务对象 socket_message
*
* @author hdka
* @date 2024-10-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SocketMessageBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 接收者id
*/
@NotNull(message = "接收者id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long contactId;
/**
* 发送者id
*/
@NotNull(message = "发送者id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long userId;
/**
* 发送信息内容
*/
@NotBlank(message = "发送信息内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content;
/**
* 房间号（针对群聊开发）
*/
@NotNull(message = "房间号（针对群聊开发）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long roomId;
/**
* 备注
*/
private String remark;
}

13
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SocketContactVo.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -52,4 +52,15 @@ public class SocketContactVo {
private SysUser user;
/**
* 对话信息表
*/
private List<SocketMessageVo> messages;
/**
* 房间号
*/
private Long roomId;
}

62
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SocketMessageVo.java Normal file
View File

@@ -0,0 +1,62 @@
package com.ruoyi.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 对话信息视图对象 socket_message
*
* @author hdka
* @date 2024-10-27
*/
@Data
@ExcelIgnoreUnannotated
public class SocketMessageVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 接收者id
*/
@ExcelProperty(value = "接收者id")
private Long contactId;
/**
* 发送者id
*/
@ExcelProperty(value = "发送者id")
private Long userId;
/**
* 发送信息内容
*/
@ExcelProperty(value = "发送信息内容")
private String content;
/**
* 房间号（针对群聊开发）
*/
@ExcelProperty(value = "房间号", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "针=对群聊开发")
private Long roomId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SocketMessageMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.SocketMessage;
import com.ruoyi.system.domain.vo.SocketMessageVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 对话信息Mapper接口
*
* @author hdka
* @date 2024-10-27
*/
public interface SocketMessageMapper extends BaseMapperPlus<SocketMessageMapper, SocketMessage, SocketMessageVo> {
}

5
ruoyi-system/src/main/java/com/ruoyi/system/service/ISocketContactService.java
View File

@@ -37,6 +37,11 @@ public interface ISocketContactService {
*/
Boolean insertByBo(SocketContactBo bo);
/**
* 新增通信群聊目录
*/
Boolean insertByBoAndRoom(SocketContactBo bo);
/**
* 修改通信目录
*/

55
ruoyi-system/src/main/java/com/ruoyi/system/service/ISocketMessageService.java Normal file
View File

@@ -0,0 +1,55 @@
package com.ruoyi.system.service;
import com.ruoyi.system.domain.SocketMessage;
import com.ruoyi.system.domain.vo.SocketMessageVo;
import com.ruoyi.system.domain.bo.SocketMessageBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import javax.validation.constraints.NotNull;
import java.util.Collection;
import java.util.List;
/**
* 对话信息Service接口
*
* @author hdka
* @date 2024-10-27
*/
public interface ISocketMessageService {
/**
* 查询对话信息
*/
SocketMessageVo queryById(Long id);
/**
* 查询对话信息列表
*/
TableDataInfo<SocketMessageVo> queryPageList(SocketMessageBo bo, PageQuery pageQuery);
/**
* 查询对话信息列表
*/
List<SocketMessageVo> queryList(SocketMessageBo bo);
/**
* 新增对话信息
*/
Boolean insertByBo(SocketMessageBo bo);
/**
* 修改对话信息
*/
Boolean updateByBo(SocketMessageBo bo);
/**
* 校验并批量删除对话信息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 根据contactId查询对应的List
*/
List<SocketMessageVo> queryByContactId(@NotNull(message = "主键不能为空") Long contactId);
}

64
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java
View File

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.system.domain.SocketMessage;
import com.ruoyi.system.mapper.SocketMessageMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import liquibase.pro.packaged.S;
@@ -38,12 +40,24 @@ public class SocketContactServiceImpl implements ISocketContactService {
private final SysUserMapper sysUserMapper;
private final SocketMessageMapper socketMessageMapper;
/**
* 查询通信目录
*/
@Override
public SocketContactVo queryById(Long id){
return baseMapper.selectVoById(id);
public SocketContactVo queryById(Long id) {
SocketContactVo socketContactVo = baseMapper.selectVoById(id);
LambdaQueryWrapper<SocketMessage> socketMessageLambdaQueryWrapper = new LambdaQueryWrapper<>();
socketMessageLambdaQueryWrapper.eq(SocketMessage::getRoomId, socketContactVo.getRoomId())
.and(item ->
item.eq(SocketMessage::getUserId, socketContactVo.getContactUserId())
.or()
.eq(SocketMessage::getUserId, socketContactVo.getUserId())
);
socketContactVo.setMessages(socketMessageMapper.selectVoList(socketMessageLambdaQueryWrapper));
return socketContactVo;
}
/**
@@ -82,12 +96,54 @@ public class SocketContactServiceImpl implements ISocketContactService {
*/
@Override
public Boolean insertByBo(SocketContactBo bo) {
// 正向存
SocketContact add = BeanUtil.toBean(bo, SocketContact.class);
add.setRoomId(0L);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
// 反向存
add.setContactUserId(bo.getUserId());
add.setUserId(bo.getContactUserId());
validEntityBeforeSave(add);
flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 新增通信群聊目录
*/
@Override
public Boolean insertByBoAndRoom(SocketContactBo bo) {
Long roomId = System.currentTimeMillis();
boolean flag = false;
List<SysUser> userList = bo.getUserList();
for (SysUser sysUser : userList) {
SocketContact add = BeanUtil.toBean(bo, SocketContact.class);
add.setUserId(sysUser.getUserId());
for (SysUser user : userList) {
// 当当前用户不等于接收者用户时候再进行set
if (!user.getUserId().equals(sysUser.getUserId())) {
add.setContactUserId(user.getUserId());
add.setRoomId(roomId);
flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
}
}
}
return flag;
}
@@ -104,7 +160,7 @@ public class SocketContactServiceImpl implements ISocketContactService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SocketContact entity){
private void validEntityBeforeSave(SocketContact entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -113,7 +169,7 @@ public class SocketContactServiceImpl implements ISocketContactService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

125
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketMessageServiceImpl.java Normal file
View File

@@ -0,0 +1,125 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.bo.SocketMessageBo;
import com.ruoyi.system.domain.vo.SocketMessageVo;
import com.ruoyi.system.domain.SocketMessage;
import com.ruoyi.system.mapper.SocketMessageMapper;
import com.ruoyi.system.service.ISocketMessageService;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 对话信息Service业务层处理
*
* @author hdka
* @date 2024-10-27
*/
@RequiredArgsConstructor
@Service
public class SocketMessageServiceImpl implements ISocketMessageService {
private final SocketMessageMapper baseMapper;
/**
* 查询对话信息
*/
@Override
public SocketMessageVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询对话信息列表
*/
@Override
public TableDataInfo<SocketMessageVo> queryPageList(SocketMessageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SocketMessage> lqw = buildQueryWrapper(bo);
Page<SocketMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询对话信息列表
*/
@Override
public List<SocketMessageVo> queryList(SocketMessageBo bo) {
LambdaQueryWrapper<SocketMessage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SocketMessage> buildQueryWrapper(SocketMessageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SocketMessage> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getContactId() != null, SocketMessage::getContactId, bo.getContactId());
lqw.eq(bo.getUserId() != null, SocketMessage::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getContent()), SocketMessage::getContent, bo.getContent());
lqw.eq(bo.getRoomId() != null, SocketMessage::getRoomId, bo.getRoomId());
return lqw;
}
/**
* 新增对话信息
*/
@Override
public Boolean insertByBo(SocketMessageBo bo) {
SocketMessage add = BeanUtil.toBean(bo, SocketMessage.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改对话信息
*/
@Override
public Boolean updateByBo(SocketMessageBo bo) {
SocketMessage update = BeanUtil.toBean(bo, SocketMessage.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SocketMessage entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除对话信息
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 根据对话的id查询列表
* @param contactId
* @return
*/
@Override
public List<SocketMessageVo> queryByContactId(Long contactId) {
LambdaQueryWrapper<SocketMessage> lqw = Wrappers.lambdaQuery();
lqw.eq(SocketMessage::getContactId, contactId);
return baseMapper.selectVoList(lqw);
}
}

22
ruoyi-system/src/main/resources/mapper/system/SocketMessageMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SocketMessageMapper">
<resultMap type="com.ruoyi.system.domain.SocketMessage" id="SocketMessageResult">
<result property="id" column="id"/>
<result property="contactId" column="contact_id"/>
<result property="userId" column="user_id"/>
<result property="content" column="content"/>
<result property="roomId" column="room_id"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>