From bada82f8cc5b28492d20a7e76d04e7b73d10f6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com> Date: Sun, 2 Jun 2024 17:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/idea/http-client.env.json | 2 +- .../ImConversationController.java | 10 +++---- .../admin/group/ImGroupController.java | 23 +++++----------- .../groupmember/ImGroupMemberController.java | 16 ++++++------ .../admin/message/ImMessageController.http | 18 +++++++++++++ .../admin/message/ImMessageController.java | 10 +++---- ...nMapper.java => ImConversationMapper.java} | 2 +- .../{GroupMapper.java => ImGroupMapper.java} | 2 +- ...erMapper.java => ImGroupMemberMapper.java} | 2 +- .../{InboxMapper.java => ImInboxMapper.java} | 9 +++---- ...essageMapper.java => ImMessageMapper.java} | 2 +- ...ervice.java => ImConversationService.java} | 2 +- ...pl.java => ImConversationServiceImpl.java} | 18 ++++++------- ...{GroupService.java => ImGroupService.java} | 2 +- ...rviceImpl.java => ImGroupServiceImpl.java} | 18 ++++++------- ...Service.java => ImGroupMemberService.java} | 2 +- ...mpl.java => ImGroupMemberServiceImpl.java} | 20 +++++++------- ...{InboxService.java => ImInboxService.java} | 2 +- ...rviceImpl.java => ImInboxServiceImpl.java} | 16 ++++++------ ...sageService.java => ImMessageService.java} | 2 +- ...iceImpl.java => ImMessageServiceImpl.java} | 26 +++++++++---------- 21 files changed, 106 insertions(+), 98 deletions(-) create mode 100644 yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.http rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/{ConversationMapper.java => ImConversationMapper.java} (84%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/{GroupMapper.java => ImGroupMapper.java} (95%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/{GroupMemberMapper.java => ImGroupMemberMapper.java} (95%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/{InboxMapper.java => ImInboxMapper.java} (71%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/{MessageMapper.java => ImMessageMapper.java} (91%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/{ConversationService.java => ImConversationService.java} (96%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/{ConversationServiceImpl.java => ImConversationServiceImpl.java} (81%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/{GroupService.java => ImGroupService.java} (96%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/{GroupServiceImpl.java => ImGroupServiceImpl.java} (78%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/{GroupMemberService.java => ImGroupMemberService.java} (97%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/{GroupMemberServiceImpl.java => ImGroupMemberServiceImpl.java} (76%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/{InboxService.java => ImInboxService.java} (95%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/{InboxServiceImpl.java => ImInboxServiceImpl.java} (86%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/{MessageService.java => ImMessageService.java} (96%) rename yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/{MessageServiceImpl.java => ImMessageServiceImpl.java} (81%) diff --git a/script/idea/http-client.env.json b/script/idea/http-client.env.json index 4a4cb5221e..307ca11d58 100644 --- a/script/idea/http-client.env.json +++ b/script/idea/http-client.env.json @@ -1,7 +1,7 @@ { "local": { "baseUrl": "http://127.0.0.1:48080/admin-api", - "token": "test1", + "token": "test100", "adminTenentId": "1", "appApi": "http://127.0.0.1:48080/app-api", diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/conversation/ImConversationController.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/conversation/ImConversationController.java index ea83761a53..112866ec2d 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/conversation/ImConversationController.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/conversation/ImConversationController.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.im.controller.admin.conversation.vo.ImConversatio import cn.iocoder.yudao.module.im.controller.admin.conversation.vo.ImConversationRespVO; import cn.iocoder.yudao.module.im.controller.admin.conversation.vo.ImConversationUpdatePinnedReqVO; import cn.iocoder.yudao.module.im.dal.dataobject.conversation.ImConversationDO; -import cn.iocoder.yudao.module.im.service.conversation.ConversationService; +import cn.iocoder.yudao.module.im.service.conversation.ImConversationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -26,26 +26,26 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti public class ImConversationController { @Resource - private ConversationService conversationService; + private ImConversationService imConversationService; @GetMapping("/list") @Operation(summary = "获得用户的会话列表") public CommonResult> getConversationList() { - List conversationList = conversationService.getConversationList(); + List conversationList = imConversationService.getConversationList(); return success(BeanUtils.toBean(conversationList, ImConversationRespVO.class)); } @PostMapping("/update-pinned") @Operation(summary = "置顶会话") public CommonResult updatePinned(@Valid @RequestBody ImConversationUpdatePinnedReqVO updateReqVO) { - conversationService.updatePinned(getLoginUserId(),updateReqVO); + imConversationService.updatePinned(getLoginUserId(),updateReqVO); return success(true); } @PostMapping("/update-last-read-time") @Operation(summary = "更新最后已读时间") public CommonResult updateLastReadTime(@Valid @RequestBody ImConversationUpdateLastReadTimeReqVO updateReqVO) { - conversationService.updateLastReadTime(getLoginUserId(),updateReqVO); + imConversationService.updateLastReadTime(getLoginUserId(),updateReqVO); return success(true); } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupController.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupController.java index 807093ae45..166812c8fa 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupController.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupController.java @@ -9,24 +9,15 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; - import cn.iocoder.yudao.module.im.controller.admin.group.vo.*; import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupDO; -import cn.iocoder.yudao.module.im.service.group.GroupService; +import cn.iocoder.yudao.module.im.service.group.ImGroupService; // TODO @芋艿：得看看 create、update、delete、get、page 这几个接口，要保留哪些 @Tag(name = "管理后台 - 群") @@ -36,20 +27,20 @@ import cn.iocoder.yudao.module.im.service.group.GroupService; public class ImGroupController { @Resource - private GroupService groupService; + private ImGroupService imGroupService; @PostMapping("/create") @Operation(summary = "创建群") @PreAuthorize("@ss.hasPermission('im:group:create')") public CommonResult createGroup(@Valid @RequestBody ImGroupSaveReqVO createReqVO) { - return success(groupService.createGroup(createReqVO)); + return success(imGroupService.createGroup(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新群") @PreAuthorize("@ss.hasPermission('im:group:update')") public CommonResult updateGroup(@Valid @RequestBody ImGroupSaveReqVO updateReqVO) { - groupService.updateGroup(updateReqVO); + imGroupService.updateGroup(updateReqVO); return success(true); } @@ -58,7 +49,7 @@ public class ImGroupController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('im:group:delete')") public CommonResult deleteGroup(@RequestParam("id") Long id) { - groupService.deleteGroup(id); + imGroupService.deleteGroup(id); return success(true); } @@ -67,7 +58,7 @@ public class ImGroupController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('im:group:query')") public CommonResult getGroup(@RequestParam("id") Long id) { - ImGroupDO group = groupService.getGroup(id); + ImGroupDO group = imGroupService.getGroup(id); return success(BeanUtils.toBean(group, ImGroupRespVO.class)); } @@ -75,7 +66,7 @@ public class ImGroupController { @Operation(summary = "获得群分页") @PreAuthorize("@ss.hasPermission('im:group:query')") public CommonResult> getGroupPage(@Valid ImGroupPageReqVO pageReqVO) { - PageResult pageResult = groupService.getGroupPage(pageReqVO); + PageResult pageResult = imGroupService.getGroupPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ImGroupRespVO.class)); } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/groupmember/ImGroupMemberController.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/groupmember/ImGroupMemberController.java index 319031e590..e260de00d6 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/groupmember/ImGroupMemberController.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/groupmember/ImGroupMemberController.java @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberP import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberRespVO; import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberSaveReqVO; import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO; -import cn.iocoder.yudao.module.im.service.groupmember.GroupMemberService; +import cn.iocoder.yudao.module.im.service.groupmember.ImGroupMemberService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -35,20 +35,20 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E public class ImGroupMemberController { @Resource - private GroupMemberService groupMemberService; + private ImGroupMemberService imGroupMemberService; @PostMapping("/create") @Operation(summary = "创建群成员") @PreAuthorize("@ss.hasPermission('im:group-member:create')") public CommonResult createGroupMember(@Valid @RequestBody ImGroupMemberSaveReqVO createReqVO) { - return success(groupMemberService.createGroupMember(createReqVO)); + return success(imGroupMemberService.createGroupMember(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新群成员") @PreAuthorize("@ss.hasPermission('im:group-member:update')") public CommonResult updateGroupMember(@Valid @RequestBody ImGroupMemberSaveReqVO updateReqVO) { - groupMemberService.updateGroupMember(updateReqVO); + imGroupMemberService.updateGroupMember(updateReqVO); return success(true); } @@ -57,7 +57,7 @@ public class ImGroupMemberController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('im:group-member:delete')") public CommonResult deleteGroupMember(@RequestParam("id") Long id) { - groupMemberService.deleteGroupMember(id); + imGroupMemberService.deleteGroupMember(id); return success(true); } @@ -66,7 +66,7 @@ public class ImGroupMemberController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('im:group-member:query')") public CommonResult getGroupMember(@RequestParam("id") Long id) { - ImGroupMemberDO groupMember = groupMemberService.getGroupMember(id); + ImGroupMemberDO groupMember = imGroupMemberService.getGroupMember(id); return success(BeanUtils.toBean(groupMember, ImGroupMemberRespVO.class)); } @@ -74,7 +74,7 @@ public class ImGroupMemberController { @Operation(summary = "获得群成员分页") @PreAuthorize("@ss.hasPermission('im:group-member:query')") public CommonResult> getGroupMemberPage(@Valid ImGroupMemberPageReqVO pageReqVO) { - PageResult pageResult = groupMemberService.getGroupMemberPage(pageReqVO); + PageResult pageResult = imGroupMemberService.getGroupMemberPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ImGroupMemberRespVO.class)); } @@ -85,7 +85,7 @@ public class ImGroupMemberController { public void exportGroupMemberExcel(@Valid ImGroupMemberPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = groupMemberService.getGroupMemberPage(pageReqVO).getList(); + List list = imGroupMemberService.getGroupMemberPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "群成员.xls", "数据", ImGroupMemberRespVO.class, BeanUtils.toBean(list, ImGroupMemberRespVO.class)); diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.http b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.http new file mode 100644 index 0000000000..83d177313f --- /dev/null +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.http @@ -0,0 +1,18 @@ +### 请求 /send 接口 => 成功 +POST {{baseUrl}}/im/message/send +Authorization: Bearer {{token}} +Content-Type: application/json +tenant-id: {{adminTenentId}} + +{ + "clientMessageId": "123", + "receiverId": 1, + "conversationType": 1, + "contentType": 101, + "content": "你好1" +} + +### 请求 /pull 接口 => 成功 +GET {{baseUrl}}/im/message/pull?sequence=0&size=2 +Authorization: Bearer {{token}} +tenant-id: {{adminTenentId}} \ No newline at end of file diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.java index b246df07c3..96451bf215 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/ImMessageController.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageRespVO; import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageSendReqVO; import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageSendRespVO; import cn.iocoder.yudao.module.im.dal.dataobject.message.ImMessageDO; -import cn.iocoder.yudao.module.im.service.message.MessageService; +import cn.iocoder.yudao.module.im.service.message.ImMessageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,12 +28,12 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti public class ImMessageController { @Resource - private MessageService messageService; + private ImMessageService imMessageService; @PostMapping("/send") @Operation(summary = "发送消息") public CommonResult sendMessage(@Valid @RequestBody ImMessageSendReqVO imMessageSendReqVO) { - ImMessageDO message = messageService.sendMessage(getLoginUserId(), imMessageSendReqVO); + ImMessageDO message = imMessageService.sendMessage(getLoginUserId(), imMessageSendReqVO); return success(BeanUtils.toBean(message, ImMessageSendRespVO.class)); } @@ -43,14 +43,14 @@ public class ImMessageController { @Parameter(name = "size", description = "条数", required = true, example = "10") public CommonResult> pullMessageList(@RequestParam("sequence") Long sequence, @RequestParam("size") Integer size) { - List messages = messageService.pullMessageList(getLoginUserId(), sequence, size); + List messages = imMessageService.pullMessageList(getLoginUserId(), sequence, size); return success(BeanUtils.toBean(messages, ImMessageRespVO.class)); } @GetMapping("/list") @Operation(summary = "消息列表-根据接收人和发送时间进行分页查询") public CommonResult> getMessageList(@Valid ImMessageListReqVO listReqVO) { - List messagePage = messageService.getMessageList(getLoginUserId(), listReqVO); + List messagePage = imMessageService.getMessageList(getLoginUserId(), listReqVO); return success(BeanUtils.toBean(messagePage, ImMessageRespVO.class)); } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ConversationMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ImConversationMapper.java similarity index 84% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ConversationMapper.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ImConversationMapper.java index ed6fe155c4..f19a556efc 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ConversationMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/conversation/ImConversationMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; * @author 芋道源码 */ @Mapper -public interface ConversationMapper extends BaseMapperX { +public interface ImConversationMapper extends BaseMapperX { default ImConversationDO selectByNo(String no){ return selectOne(ImConversationDO::getNo, no); diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/GroupMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java similarity index 95% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/GroupMapper.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java index ed5cafbfa0..e9eb2827e6 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/GroupMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.im.controller.admin.group.vo.*; * @author 芋道源码 */ @Mapper -public interface GroupMapper extends BaseMapperX { +public interface ImGroupMapper extends BaseMapperX { default PageResult selectPage(ImGroupPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/GroupMemberMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/ImGroupMemberMapper.java similarity index 95% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/GroupMemberMapper.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/ImGroupMemberMapper.java index 1ebf494844..5b4a4109cd 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/GroupMemberMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/groupmember/ImGroupMemberMapper.java @@ -15,7 +15,7 @@ import java.util.List; * @author 芋道源码 */ @Mapper -public interface GroupMemberMapper extends BaseMapperX { +public interface ImGroupMemberMapper extends BaseMapperX { default PageResult selectPage(ImGroupMemberPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/InboxMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/ImInboxMapper.java similarity index 71% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/InboxMapper.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/ImInboxMapper.java index cea1e759b0..0d11194437 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/InboxMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/inbox/ImInboxMapper.java @@ -7,20 +7,19 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; -// TODO @hao：IM 前缀 /** * IM 收件箱 Mapper * * @author 芋道源码 */ @Mapper -public interface InboxMapper extends BaseMapperX { +public interface ImInboxMapper extends BaseMapperX { default List selectListByUserIdAndSequence(Long userId, Long sequence, Integer size) { return selectList(new LambdaQueryWrapperX() - .gt(ImInboxDO::getUserId, userId) - .gt(ImInboxDO::getSequence, sequence) - .orderByAsc(ImInboxDO::getSequence) + .eq(ImInboxDO::getUserId, userId) + .gt(sequence != null, ImInboxDO::getSequence, sequence) + .orderByDesc(ImInboxDO::getSequence) .last("LIMIT " + size)); } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/MessageMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImMessageMapper.java similarity index 91% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/MessageMapper.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImMessageMapper.java index 5a84c3b003..efd50f6dd7 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/MessageMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImMessageMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @author 芋道源码 */ @Mapper -public interface MessageMapper extends BaseMapperX { +public interface ImMessageMapper extends BaseMapperX { default List selectMessageList(ImMessageDO message) { return selectList(new LambdaQueryWrapperX() diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationService.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationService.java similarity index 96% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationService.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationService.java index 4d1a486164..216e04a64e 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationService.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationService.java @@ -12,7 +12,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface ConversationService { +public interface ImConversationService { /** * 获得用户的会话列表 diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationServiceImpl.java similarity index 81% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationServiceImpl.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationServiceImpl.java index f6bc6d329f..20d9f52763 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ConversationServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/conversation/ImConversationServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.im.service.conversation; import cn.iocoder.yudao.module.im.controller.admin.conversation.vo.ImConversationUpdateLastReadTimeReqVO; import cn.iocoder.yudao.module.im.controller.admin.conversation.vo.ImConversationUpdatePinnedReqVO; import cn.iocoder.yudao.module.im.dal.dataobject.conversation.ImConversationDO; -import cn.iocoder.yudao.module.im.dal.mysql.conversation.ConversationMapper; +import cn.iocoder.yudao.module.im.dal.mysql.conversation.ImConversationMapper; import cn.iocoder.yudao.module.im.enums.conversation.ImConversationTypeEnum; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -19,14 +19,14 @@ import java.util.List; */ @Service @Validated -public class ConversationServiceImpl implements ConversationService { +public class ImConversationServiceImpl implements ImConversationService { @Resource - private ConversationMapper conversationMapper; + private ImConversationMapper imConversationMapper; @Override public List getConversationList() { - return conversationMapper.selectList(); + return imConversationMapper.selectList(); } @Override @@ -34,14 +34,14 @@ public class ConversationServiceImpl implements ConversationService { // 1. 获得会话编号 String no = ImConversationTypeEnum.generateConversationNo(loginUserId, updateReqVO.getTargetId(), updateReqVO.getType()); // 2. 查询会话 - ImConversationDO conversation = conversationMapper.selectByNo(no); + ImConversationDO conversation = imConversationMapper.selectByNo(no); if (conversation == null) { // 2.1. 不存在，则插入 conversation = insertConversation(no, loginUserId, updateReqVO.getTargetId(), updateReqVO.getType()); } // 3. 更新会话 conversation.setPinned(updateReqVO.getPinned()); - conversationMapper.updateById(conversation); + imConversationMapper.updateById(conversation); // 4. 做对应更新的 notify 推送 } @@ -51,7 +51,7 @@ public class ConversationServiceImpl implements ConversationService { imConversationDO.setUserId(userId); imConversationDO.setTargetId(targetId); imConversationDO.setType(type); - conversationMapper.insert(imConversationDO); + imConversationMapper.insert(imConversationDO); return imConversationDO; } @@ -60,14 +60,14 @@ public class ConversationServiceImpl implements ConversationService { // 1. 获得会话编号 String no = ImConversationTypeEnum.generateConversationNo(loginUserId, updateReqVO.getTargetId(), updateReqVO.getType()); // 2. 查询会话 - ImConversationDO conversation = conversationMapper.selectByNo(no); + ImConversationDO conversation = imConversationMapper.selectByNo(no); if (conversation == null) { // 2.1. 不存在，则插入 conversation = insertConversation(no, loginUserId, updateReqVO.getTargetId(), updateReqVO.getType()); } // 3. 更新会话 conversation.setLastReadTime(updateReqVO.getLastReadTime()); - conversationMapper.updateById(conversation); + imConversationMapper.updateById(conversation); // 4. 做对应更新的 notify 推送 } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupService.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupService.java similarity index 96% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupService.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupService.java index 98624c6599..db10e88c67 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupService.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupService.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; * * @author 芋道源码 */ -public interface GroupService { +public interface ImGroupService { /** * 创建群 diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java similarity index 78% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupServiceImpl.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java index 4c1efde497..118858acd9 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/GroupServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.im.dal.mysql.group.GroupMapper; +import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.*; @@ -22,16 +22,16 @@ import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.*; */ @Service @Validated -public class GroupServiceImpl implements GroupService { +public class ImGroupServiceImpl implements ImGroupService { @Resource - private GroupMapper groupMapper; + private ImGroupMapper imGroupMapper; @Override public Long createGroup(ImGroupSaveReqVO createReqVO) { // 插入 ImGroupDO group = BeanUtils.toBean(createReqVO, ImGroupDO.class); - groupMapper.insert(group); + imGroupMapper.insert(group); // 返回 return group.getId(); } @@ -42,7 +42,7 @@ public class GroupServiceImpl implements GroupService { validateGroupExists(updateReqVO.getId()); // 更新 ImGroupDO updateObj = BeanUtils.toBean(updateReqVO, ImGroupDO.class); - groupMapper.updateById(updateObj); + imGroupMapper.updateById(updateObj); } @Override @@ -50,23 +50,23 @@ public class GroupServiceImpl implements GroupService { // 校验存在 validateGroupExists(id); // 删除 - groupMapper.deleteById(id); + imGroupMapper.deleteById(id); } private void validateGroupExists(Long id) { - if (groupMapper.selectById(id) == null) { + if (imGroupMapper.selectById(id) == null) { throw exception(GROUP_NOT_EXISTS); } } @Override public ImGroupDO getGroup(Long id) { - return groupMapper.selectById(id); + return imGroupMapper.selectById(id); } @Override public PageResult getGroupPage(ImGroupPageReqVO pageReqVO) { - return groupMapper.selectPage(pageReqVO); + return imGroupMapper.selectPage(pageReqVO); } } \ No newline at end of file diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberService.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberService.java similarity index 97% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberService.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberService.java index 3188c2e3fe..44f4f7087f 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberService.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberService.java @@ -13,7 +13,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface GroupMemberService { +public interface ImGroupMemberService { /** * 创建群成员 diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberServiceImpl.java similarity index 76% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberServiceImpl.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberServiceImpl.java index 43df1b9ac4..1d5ac422d4 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/GroupMemberServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/groupmember/ImGroupMemberServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.im.dal.mysql.groupmember.GroupMemberMapper; +import cn.iocoder.yudao.module.im.dal.mysql.groupmember.ImGroupMemberMapper; import java.util.List; @@ -23,16 +23,16 @@ import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.*; */ @Service @Validated -public class GroupMemberServiceImpl implements GroupMemberService { +public class ImGroupMemberServiceImpl implements ImGroupMemberService { @Resource - private GroupMemberMapper groupMemberMapper; + private ImGroupMemberMapper imGroupMemberMapper; @Override public Long createGroupMember(ImGroupMemberSaveReqVO createReqVO) { // 插入 ImGroupMemberDO groupMember = BeanUtils.toBean(createReqVO, ImGroupMemberDO.class); - groupMemberMapper.insert(groupMember); + imGroupMemberMapper.insert(groupMember); // 返回 return groupMember.getId(); } @@ -43,7 +43,7 @@ public class GroupMemberServiceImpl implements GroupMemberService { validateGroupMemberExists(updateReqVO.getId()); // 更新 ImGroupMemberDO updateObj = BeanUtils.toBean(updateReqVO, ImGroupMemberDO.class); - groupMemberMapper.updateById(updateObj); + imGroupMemberMapper.updateById(updateObj); } @Override @@ -51,28 +51,28 @@ public class GroupMemberServiceImpl implements GroupMemberService { // 校验存在 validateGroupMemberExists(id); // 删除 - groupMemberMapper.deleteById(id); + imGroupMemberMapper.deleteById(id); } private void validateGroupMemberExists(Long id) { - if (groupMemberMapper.selectById(id) == null) { + if (imGroupMemberMapper.selectById(id) == null) { throw exception(GROUP_MEMBER_NOT_EXISTS); } } @Override public ImGroupMemberDO getGroupMember(Long id) { - return groupMemberMapper.selectById(id); + return imGroupMemberMapper.selectById(id); } @Override public PageResult getGroupMemberPage(ImGroupMemberPageReqVO pageReqVO) { - return groupMemberMapper.selectPage(pageReqVO); + return imGroupMemberMapper.selectPage(pageReqVO); } @Override public List selectByGroupId(Long groupId) { - return groupMemberMapper.selectListByGroupId(groupId); + return imGroupMemberMapper.selectListByGroupId(groupId); } } \ No newline at end of file diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxService.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxService.java similarity index 95% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxService.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxService.java index 85e4a63ceb..ee44c54ee4 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxService.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxService.java @@ -10,7 +10,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface InboxService { +public interface ImInboxService { /** * 保存收件箱和发送消息 diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxServiceImpl.java similarity index 86% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxServiceImpl.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxServiceImpl.java index 537e427122..afadec7231 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/InboxServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxServiceImpl.java @@ -6,11 +6,11 @@ import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageRespVO; import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO; import cn.iocoder.yudao.module.im.dal.dataobject.inbox.ImInboxDO; import cn.iocoder.yudao.module.im.dal.dataobject.message.ImMessageDO; -import cn.iocoder.yudao.module.im.dal.mysql.inbox.InboxMapper; +import cn.iocoder.yudao.module.im.dal.mysql.inbox.ImInboxMapper; import cn.iocoder.yudao.module.im.dal.redis.inbox.InboxLockRedisDAO; import cn.iocoder.yudao.module.im.dal.redis.inbox.SequenceRedisDAO; import cn.iocoder.yudao.module.im.enums.conversation.ImConversationTypeEnum; -import cn.iocoder.yudao.module.im.service.groupmember.GroupMemberService; +import cn.iocoder.yudao.module.im.service.groupmember.ImGroupMemberService; import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; import jakarta.annotation.Resource; import org.dromara.hutool.core.date.DateUnit; @@ -27,13 +27,13 @@ import java.util.List; */ @Service @Validated -public class InboxServiceImpl implements InboxService { +public class ImInboxServiceImpl implements ImInboxService { private static final Long INBOX_LOCK_TIMEOUT = 120 * DateUnit.SECOND.getMillis(); private static final String IM_MESSAGE_RECEIVE = "im-message-receive"; @Resource - private InboxMapper inboxMapper; + private ImInboxMapper imInboxMapper; @Resource private SequenceRedisDAO sequenceRedisDAO; @@ -43,7 +43,7 @@ public class InboxServiceImpl implements InboxService { @Resource private WebSocketSenderApi webSocketSenderApi; @Resource - private GroupMemberService groupMemberService; + private ImGroupMemberService imGroupMemberService; @Override public void saveInboxAndSendMessage(ImMessageDO message) { @@ -55,14 +55,14 @@ public class InboxServiceImpl implements InboxService { saveInboxAndSendMessageForUser(message.getReceiverId(), message); } else if (message.getConversationType().equals(ImConversationTypeEnum.GROUP.getType())) { // 2.2 如果是群聊，发送给群聊的所有人 - List groupMembers = groupMemberService.selectByGroupId(message.getReceiverId()); + List groupMembers = imGroupMemberService.selectByGroupId(message.getReceiverId()); groupMembers.forEach(groupMemberDO -> saveInboxAndSendMessageForUser(groupMemberDO.getUserId(), message)); } } @Override public List selectMessageIdsByUserIdAndSequence(Long userId, Long sequence, Integer size) { - List imInboxDOS = inboxMapper.selectListByUserIdAndSequence(userId, sequence, size); + List imInboxDOS = imInboxMapper.selectListByUserIdAndSequence(userId, sequence, size); return imInboxDOS.stream().map(ImInboxDO::getMessageId).toList(); } @@ -77,7 +77,7 @@ public class InboxServiceImpl implements InboxService { .setUserId(userId) .setMessageId(message.getId()) .setSequence(userSequence); - inboxMapper.insert(inbox); + imInboxMapper.insert(inbox); // 3. 发送消息 sendAsyncMessage(userId, message, userSequence); }); diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageService.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageService.java similarity index 96% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageService.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageService.java index ae1c5dc213..30701dba10 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageService.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageService.java @@ -12,7 +12,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface MessageService { +public interface ImMessageService { /** * 获得历史消息 diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageServiceImpl.java similarity index 81% rename from yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageServiceImpl.java rename to yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageServiceImpl.java index eb1d41cb5e..e6adbe149a 100755 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/MessageServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageServiceImpl.java @@ -5,12 +5,12 @@ import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageListReqVO import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageSendReqVO; import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO; import cn.iocoder.yudao.module.im.dal.dataobject.message.ImMessageDO; -import cn.iocoder.yudao.module.im.dal.mysql.message.MessageMapper; +import cn.iocoder.yudao.module.im.dal.mysql.message.ImMessageMapper; import cn.iocoder.yudao.module.im.enums.conversation.ImConversationTypeEnum; import cn.iocoder.yudao.module.im.enums.message.ImMessageSourceEnum; import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum; -import cn.iocoder.yudao.module.im.service.groupmember.GroupMemberService; -import cn.iocoder.yudao.module.im.service.inbox.InboxService; +import cn.iocoder.yudao.module.im.service.groupmember.ImGroupMemberService; +import cn.iocoder.yudao.module.im.service.inbox.ImInboxService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import jakarta.annotation.Resource; @@ -33,16 +33,16 @@ import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.MESSAGE_RECEIV @Service @Validated @Slf4j -public class MessageServiceImpl implements MessageService { +public class ImMessageServiceImpl implements ImMessageService { @Resource - private MessageMapper messageMapper; + private ImMessageMapper imMessageMapper; @Resource private AdminUserApi adminUserApi; @Resource - private InboxService inboxService; + private ImInboxService imInboxService; @Resource - private GroupMemberService groupMemberService; + private ImGroupMemberService imGroupMemberService; @Override public List getMessageList(Long loginUserId, ImMessageListReqVO listReqVO) { @@ -52,13 +52,13 @@ public class MessageServiceImpl implements MessageService { ImMessageDO message = new ImMessageDO() .setSendTime(listReqVO.getSendTime()) .setConversationNo(no); - return messageMapper.selectMessageList(message); + return imMessageMapper.selectMessageList(message); } @Override public List pullMessageList(Long userId, Long sequence, Integer size) { - List messageIds = inboxService.selectMessageIdsByUserIdAndSequence(userId, sequence, size); - return messageMapper.selectBatchIds(messageIds); + List messageIds = imInboxService.selectMessageIdsByUserIdAndSequence(userId, sequence, size); + return imMessageMapper.selectBatchIds(messageIds); } @Override @@ -66,7 +66,7 @@ public class MessageServiceImpl implements MessageService { // 1. 保存消息 ImMessageDO message = saveMessage(fromUserId, imMessageSendReqVO); // 2. 保存到收件箱，并发送消息 - inboxService.saveInboxAndSendMessage(message); + imInboxService.saveInboxAndSendMessage(message); return message; } @@ -83,7 +83,7 @@ public class MessageServiceImpl implements MessageService { .setSendFrom(ImMessageSourceEnum.USER_SEND.getSource()) .setMessageStatus(ImMessageStatusEnum.SENDING.getStatus()) .setSendTime(TimeUtil.now()); - messageMapper.insert(imMessageDO); + imMessageMapper.insert(imMessageDO); return imMessageDO; } @@ -96,7 +96,7 @@ public class MessageServiceImpl implements MessageService { } } else if (message.getConversationType().equals(ImConversationTypeEnum.GROUP.getType())) { // 校验群聊是否存在 - List imGroupMemberDOS = groupMemberService.selectByGroupId(message.getReceiverId()); + List imGroupMemberDOS = imGroupMemberService.selectByGroupId(message.getReceiverId()); if (imGroupMemberDOS.isEmpty()) { throw exception(MESSAGE_RECEIVER_NOT_EXISTS); }