+ * 会话列表 前端控制器 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Controller +@RequestMapping("/contact") +public class ContactController { + +} + diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/GroupMemberController.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/GroupMemberController.java new file mode 100644 index 0000000..ece7322 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/GroupMemberController.java @@ -0,0 +1,20 @@ +package com.abin.mallchat.common.chat.controller; + + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + *+ * 群成员表 前端控制器 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Controller +@RequestMapping("/groupMember") +public class GroupMemberController { + +} + diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java new file mode 100644 index 0000000..ef4f012 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java @@ -0,0 +1,20 @@ +package com.abin.mallchat.common.chat.controller; + + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + *+ * 房间表 前端控制器 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Controller +@RequestMapping("/room") +public class RoomController { + +} + diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java new file mode 100644 index 0000000..efd2bf0 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java @@ -0,0 +1,20 @@ +package com.abin.mallchat.common.chat.dao; + +import com.abin.mallchat.common.chat.domain.entity.Contact; +import com.abin.mallchat.common.chat.mapper.ContactMapper; +import com.abin.mallchat.common.chat.service.IContactService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *+ * 会话列表 服务实现类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Service +public class ContactDao extends ServiceImpl+ * 群成员表 服务实现类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Service +public class GroupMemberDao extends ServiceImpl- * 会话表 服务实现类 + * 房间表 服务实现类 *
* * @author abin - * @since 2023-03-25 + * @since 2023-07-16 */ @Service -public class RoomDao extends ServiceImpl+ * 会话列表 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("contact") +public class Contact implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * uid + */ + @TableField("uid") + private Long uid; + + /** + * 聊天类型 1单聊 2普通群聊 + */ + @TableField("type") + private Integer type; + + /** + * 是否全员展示 0否 1是 + */ + @TableField("hot_flag") + private Integer hotFlag; + + /** + * 聊天对象type=1:uid，type=2:房间id + */ + @TableField("target_id") + private Long targetId; + + /** + * 阅读到的时间 + */ + @TableField("read_time") + private LocalDateTime readTime; + + /** + * 会话内消息最后更新的时间(只有普通会话需要维护，全员会话不需要维护) + */ + @TableField("active_time") + private LocalDateTime activeTime; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java new file mode 100644 index 0000000..1b8ed4f --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java @@ -0,0 +1,65 @@ +package com.abin.mallchat.common.chat.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * 群成员表 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("group_member") +public class GroupMember implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 房间id + */ + @TableField("room_id") + private Long roomId; + + /** + * 成员uid + */ + @TableField("uid") + private Long uid; + + /** + * 成员类型 1群主 2管理员 3普通成员 + */ + @TableField("type") + private Integer type; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java index ef74c67..67a6ec2 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java @@ -8,15 +8,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** *- * 会话表 + * 房间表 *
* * @author abin - * @since 2023-03-25 + * @since 2023-07-16 */ @Data @EqualsAndHashCode(callSuper = false) @@ -32,36 +32,52 @@ public class Room implements Serializable { private Long id; /** - * 会话名 + * 群名称 */ @TableField("name") private String name; /** - * 会话类型 1大群聊 2沸点 - * - * @see com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum + * 群头像 + */ + @TableField("avatar") + private String avatar; + + /** + * 房间类型 1群聊 */ @TableField("type") private Integer type; /** - * 最后活跃时间-排序 + * 是否全员展示 0否 1是 + */ + @TableField("hot_flag") + private Integer hotFlag; + + /** + * 群最后消息的更新时间（热点群不需要写扩散，更新这里就行） */ @TableField("active_time") - private Date activeTime; + private LocalDateTime activeTime; + + /** + * 额外信息（根据不同类型房间有不同存储的东西） + */ + @TableField("ext_json") + private String extJson; /** * 创建时间 */ @TableField("create_time") - private Date createTime; + private LocalDateTime createTime; /** * 修改时间 */ @TableField("update_time") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java new file mode 100644 index 0000000..5e9aa15 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java @@ -0,0 +1,16 @@ +package com.abin.mallchat.common.chat.mapper; + +import com.abin.mallchat.common.chat.domain.entity.Contact; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 会话列表 Mapper 接口 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface ContactMapper extends BaseMapper+ * 群成员表 Mapper 接口 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface GroupMemberMapper extends BaseMapper- * 会话表 Mapper 接口 + * 房间表 Mapper 接口 *
* * @author abin - * @since 2023-03-25 + * @since 2023-07-16 */ public interface RoomMapper extends BaseMapper+ * 会话列表 服务类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface IContactService extends IService+ * 群成员表 服务类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface IGroupMemberService extends IService- * 会话表 服务类 + * 房间表 服务类 *
* * @author abin - * @since 2023-03-25 + * @since 2023-07-16 */ public interface IRoomService extends IService+ * 用户申请表 前端控制器 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Controller +@RequestMapping("/userApply") +public class UserApplyController { + +} + diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java new file mode 100644 index 0000000..654c5d3 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java @@ -0,0 +1,20 @@ +package com.abin.mallchat.common.user.controller; + + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + *+ * 用户联系人表 前端控制器 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Controller +@RequestMapping("/userFriend") +public class UserFriendController { + +} + diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java new file mode 100644 index 0000000..0beacd6 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java @@ -0,0 +1,20 @@ +package com.abin.mallchat.common.user.dao; + +import com.abin.mallchat.common.user.domain.entity.UserApply; +import com.abin.mallchat.common.user.mapper.UserApplyMapper; +import com.abin.mallchat.common.user.service.IUserApplyService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *+ * 用户申请表 服务实现类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Service +public class UserApplyDao extends ServiceImpl+ * 用户联系人表 服务实现类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Service +public class UserFriendDao extends ServiceImpl+ * 用户申请表 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("user_apply") +public class UserApply implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 申请人uid + */ + @TableField("uid") + private Long uid; + + /** + * 申请类型 1加好友 + */ + @TableField("type") + private Integer type; + + /** + * 接收人uid + */ + @TableField("target_id") + private Long targetId; + + /** + * 申请信息 + */ + @TableField("msg") + private String msg; + + /** + * 申请状态 1待审批 2同意 + */ + @TableField("status") + private Integer status; + + /** + * 阅读状态 1未读 2已读 + */ + @TableField("read_status") + private Integer readStatus; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java new file mode 100644 index 0000000..45a8d28 --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java @@ -0,0 +1,59 @@ +package com.abin.mallchat.common.user.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * 用户联系人表 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("user_friend") +public class UserFriend implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * uid + */ + @TableField("uid") + private Long uid; + + /** + * 好友uid + */ + @TableField("friend_uid") + private Long friendUid; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java new file mode 100644 index 0000000..18f7f7f --- /dev/null +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java @@ -0,0 +1,16 @@ +package com.abin.mallchat.common.user.mapper; + +import com.abin.mallchat.common.user.domain.entity.UserApply; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 用户申请表 Mapper 接口 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface UserApplyMapper extends BaseMapper+ * 用户联系人表 Mapper 接口 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface UserFriendMapper extends BaseMapper+ * 用户申请表 服务类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface IUserApplyService extends IService+ * 用户联系人表 服务类 + *
+ * + * @author abin + * @since 2023-07-16 + */ +public interface IUserFriendService extends IService+ * 好友相关接口 + *
+ * + * @author abin + * @since 2023-07-16 + */ +@RestController +@RequestMapping("/capi/user/friend") +@Api(tags = "好友相关接口") +@Slf4j +public class FriendController { + @Autowired + private ChatService chatService; + @Autowired + private UserCache userCache; + + @GetMapping("/check") + @ApiOperation("批量判断是否是自己好友") + public ApiResult