删除 file-service chat 模块中的无用代码

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/ChatDialogueController.java

@@ -1,8 +1,9 @@
 package cn.reghao.tnb.file.app.zchat.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.*;
-import cn.reghao.tnb.file.app.zchat.model.po.chat.ChatDialogue;
+import cn.reghao.tnb.file.app.zchat.model.vo.ChatInitialRet;
+import cn.reghao.tnb.file.app.zchat.model.vo.ChatUpdate;
+import cn.reghao.tnb.file.app.zchat.model.vo.ChatDialogueInfo;
 import cn.reghao.tnb.file.app.zchat.service.ChatDialogueService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
@@ -23,27 +24,20 @@ public class ChatDialogueController {
         this.chatDialogueService = chatDialogueService;
     }
 
-    @Operation(summary = "创建聊天窗口")
-    @PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkCreate(@RequestBody ChatInitial chatInitial) {
-        ChatInitialRet chatInitialRet = chatDialogueService.createChatDialog(chatInitial);
-        return WebResult.success(chatInitialRet);
-    }
-
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public String updateChatDialogue(@RequestBody ChatUpdate chatUpdate) {
         chatDialogueService.updateChatDialog(chatUpdate);
         return WebResult.success();
     }
 
-    @Operation(summary = "获取聊天窗口列表")
+    @Operation(summary = "获取聊天窗口")
     @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getChatDialogue(@RequestParam("chatId") long chatId) {
-        ChatDialogue chatDialogue = chatDialogueService.getChatDialog(chatId);
-        return WebResult.success(chatDialogue);
+        ChatDialogueInfo chatDialogueInfo = chatDialogueService.getChatDialog(chatId);
+        return WebResult.success(chatDialogueInfo);
     }
 
-    @Operation(summary = "获取聊天窗口列表")
+    @Operation(summary = "获取未读消息数量")
     @GetMapping(value = "/unread_total", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getTotal() {
         int total = chatDialogueService.getUnreadTotal();
@@ -56,32 +50,4 @@ public class ChatDialogueController {
         List<ChatInitialRet> list = chatDialogueService.getChatDialogs();
         return WebResult.success(list);
     }
-
-    @Operation(summary = "删除聊天窗口")
-    @PostMapping(value = "/delete", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkDelete(@RequestBody ChatDelete chatDelete) {
-        chatDialogueService.deleteChatDialog(chatDelete.getListId());
-        return WebResult.success();
-    }
-
-    @Operation(summary = "对话框置顶/取消置顶")
-    @PostMapping(value = "/topping", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkTopping(@RequestBody ChatTop chatTop) {
-        chatDialogueService.setChatDialogTop(chatTop);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "设置/取消聊天消息免打扰")
-    @PostMapping(value = "/disturb", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkDisturb(@RequestBody ChatDisturb chatDisturb) {
-        chatDialogueService.setChatDialogDisturb(chatDisturb);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "清空聊天窗口的未读消息")
-    @PostMapping(value = "/unread/clear", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkUnreadClear(@RequestBody ChatUnreadClear chatUnreadClear) {
-        chatDialogueService.clearUnread(chatUnreadClear.getReceiverId());
-        return WebResult.success();
-    }
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/ChatMessageController.java

@@ -1,101 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.ChatRecordDelete;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.ChatRecordRevoke;
-import cn.reghao.tnb.file.app.zchat.model.dto.message.*;
-import cn.reghao.tnb.file.app.zchat.service.ChatMessageService;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:30:12
- */
-@RestController
-@RequestMapping("/api/chat/v1/talk")
-public class ChatMessageController {
-    private final ChatMessageService chatMessageService;
-
-    public ChatMessageController(ChatMessageService chatMessageService) {
-        this.chatMessageService = chatMessageService;
-    }
-
-    @Operation(summary = "发送文本消息")
-    @PostMapping(value = "/message/text", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageText(@RequestBody TextMsg textMsg) throws IOException {
-        chatMessageService.sendTextMessage(textMsg);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "发送表情包消息")
-    @PostMapping(value = "/message/emoticon", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageEmoticon(@RequestBody EmoticonMsg emoticonMsg) {
-        chatMessageService.sendEmoticonMessage(emoticonMsg);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "发送图片消息")
-    @PostMapping(value = "/message/image", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageImage(ImageMsg imageMsg) throws IOException {
-        chatMessageService.sendImageMessage(imageMsg);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "发送文件消息")
-    @PostMapping(value = "/message/file", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageFile(@RequestBody FileMsg fileMsg) throws IOException {
-        chatMessageService.sendFileMessage(fileMsg);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "转发聊天记录消息")
-    @PostMapping(value = "/message/forward", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageForward(@RequestBody ForwardMsg forwardMsg) {
-        return WebResult.success();
-    }
-
-    @Operation(summary = "发送代码块消息")
-    @PostMapping(value = "/message/code", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageCode(@RequestBody CodeBlockMsg codeBlockMsg) throws IOException {
-        chatMessageService.sendCodeBlockMessage(codeBlockMsg);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "(群组中)发送投票消息")
-    @PostMapping(value = "/message/vote", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageVote(@RequestBody VoteMsg voteMsg) {
-        return WebResult.success();
-    }
-
-    @Operation(summary = "(群组中)进行投票")
-    @PostMapping(value = "/message/vote/handle", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageVoteHandle(@RequestParam("record_id") int messageId,
-                                        @RequestParam("options") String options) {
-        VoteMsgResult voteMsgResult = new VoteMsgResult();
-        return WebResult.success(voteMsgResult);
-    }
-
-    @Operation(summary = "撤回消息")
-    @PostMapping(value = "/message/revoke", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageRevoke(@RequestBody ChatRecordRevoke chatRecordRevoke) throws IOException {
-        long messageId = chatRecordRevoke.getMessageId();
-        chatMessageService.revokeChatRecord(messageId);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "删除消息")
-    @PostMapping(value = "/message/delete", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageDelete(@RequestBody ChatRecordDelete chatRecordDelete) {
-        return WebResult.success();
-    }
-
-    @Operation(summary = "收藏(表情包)消息")
-    @PostMapping(value = "/message/collect", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageCollect(@RequestParam("record_id") int messageId) {
-        return WebResult.success();
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/ChatMsgController.java

@@ -1,41 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.message.*;
-import cn.reghao.tnb.file.app.zchat.model.dto.message.ImageMessage;
-import cn.reghao.tnb.file.app.zchat.service.ChatMessageService;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:30:12
- */
-@RestController
-@RequestMapping("/api/chat/chat")
-public class ChatMsgController {
-    private final ChatMessageService chatMessageService;
-
-    public ChatMsgController(ChatMessageService chatMessageService) {
-        this.chatMessageService = chatMessageService;
-    }
-
-    @Operation(summary = "发送图片消息")
-    @PostMapping(value = "/message/image", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkMessageImage(@RequestBody @Validated ImageMessage imageMessage) throws Exception {
-        String url = chatMessageService.putImageMessage(imageMessage);
-        if (url != null) {
-            return WebResult.success(url);
-        }
-
-        return WebResult.failWithMsg("not get signed url");
-    }
-
-    @Operation(summary = "heatmap")
-    @GetMapping(value = "/heatmap", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String heatMap() {
-        return WebResult.success(chatMessageService.getDateList());
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/ChatRecordController.java

@@ -1,17 +1,19 @@
 package cn.reghao.tnb.file.app.zchat.controller;
 
-import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.db.PageScroll;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.ChatRecordGet;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.ChatRecord;
+import cn.reghao.tnb.file.app.zchat.model.dto.ChatRecordGet;
+import cn.reghao.tnb.file.app.zchat.model.vo.ChatRecord;
 import cn.reghao.tnb.file.app.zchat.service.ChatRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * @author reghao
  * @date 2022-04-16 20:43:30
@@ -25,33 +27,17 @@ public class ChatRecordController {
         this.chatRecordService = chatRecordService;
     }
 
-    @Operation(summary = "获取与联系人的聊天记录")
+    @Operation(summary = "获取聊天记录")
     @GetMapping(value = "/records", produces = MediaType.APPLICATION_JSON_VALUE)
     public String talkRecords(ChatRecordGet chatRecordGet) {
         PageScroll<ChatRecord> pageScroll = chatRecordService.getChatRecords(chatRecordGet);
         return WebResult.success(pageScroll);
     }
 
-    @Operation(summary = "获取与联系人的历史聊天记录")
-    @GetMapping(value = "/records/history", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkRecordsHistory(ChatRecordGet chatRecordGet) {
-        PageScroll<ChatRecord> list = chatRecordService.getChatRecords(chatRecordGet);
-        return WebResult.success(list);
-    }
-
-    @Operation(summary = "转发聊天记录")
-    @GetMapping(value = "/records/forward", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkRecordsForward() {
-        return WebResult.success();
-    }
-
-    @GetMapping(value = "/search-chat-records", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkSearchChatRecords() {
-        return WebResult.success();
-    }
-
-    @GetMapping(value = "/get-records-context", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String talkGetRecordsContext() {
-        return WebResult.success();
+    @Operation(summary = "搜索聊天记录")
+    @GetMapping(value = "/records/search", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String searchChatRecords(@RequestParam("keyword") String keyword) {
+        Map<String, Object> map = chatRecordService.search(keyword);
+        return WebResult.success(map);
     }
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/ChatUserController.java

@@ -1,29 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.tnb.auth.api.dto.AccountInfo;
-import cn.reghao.tnb.auth.api.iface.AccountQuery;
-import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.vo.UserAvatar;
-import io.swagger.v3.oas.annotations.Operation;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2026-06-09 10:43:30
- */
-@RestController
-@RequestMapping("/api/chat/user")
-public class ChatUserController {
-    @DubboReference(check = false, retries = 0, timeout = 60_000)
-    private AccountQuery accountQuery;
-
-    @Operation(summary = "")
-    @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getChatUser(@RequestParam("userId") long userId) {
-        AccountInfo accountInfo = accountQuery.getAccountInfo(userId);
-        UserAvatar userAvatar = new UserAvatar(accountInfo);
-        return WebResult.success(userAvatar);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/EmoticonController.java

@@ -1,55 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.tnb.file.app.zchat.model.dto.emoticon.EmoticonInfo;
-import cn.reghao.tnb.file.app.zchat.model.dto.emoticon.EmoticonList;
-import cn.reghao.tnb.common.web.WebResult;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-16 20:43:30
- */
-@RestController
-@RequestMapping("/api/chat/v1/emoticon")
-public class EmoticonController {
-    @Operation(summary = "获取颜文字图标列表")
-    @GetMapping(value = "/list", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String emoticonList() {
-        EmoticonList emoticonList = new EmoticonList();
-        List<EmoticonInfo> collectEmoticon = new ArrayList<>();
-        collectEmoticon.add(new EmoticonInfo(1, "https://im.gzydong.club/public/media/image/talk/20220413/cb75008fbe6b8e372b0356ed6ddb73cb_456x360.png"));
-        emoticonList.setCollectEmoticon(collectEmoticon);
-
-        List<EmoticonInfo> systemEmoticon = new ArrayList<>();
-        emoticonList.setSysEmoticon(systemEmoticon);
-        return WebResult.success(emoticonList);
-    }
-
-    @GetMapping(value = "/system/list", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String emoticonSystemList() {
-        return WebResult.success();
-    }
-
-    @PostMapping(value = "/system/install", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String emoticonSystemInstall() {
-        return WebResult.success();
-    }
-
-    @PostMapping(value = "/system/del-collect-emoticon", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String emoticonSystemDelCollectEmoticon() {
-        return WebResult.success();
-    }
-
-    @PostMapping(value = "/customize/create", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String emoticonCustomizeCreate() {
-        return WebResult.success();
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/GroupController.java

@@ -1,124 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.contact.ContactInfo;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.*;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.*;
-import cn.reghao.tnb.file.app.zchat.service.GroupInfoService;
-import cn.reghao.tnb.file.app.zchat.service.GroupMemberService;
-import cn.reghao.tnb.file.app.zchat.service.GroupNoticeService;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-16 20:43:30
- */
-@RestController
-@RequestMapping("/api/user/group")
-public class GroupController {
-    private final GroupInfoService groupInfoService;
-    private final GroupMemberService groupMemberService;
-    private final GroupNoticeService groupNoticeService;
-
-    public GroupController(GroupInfoService groupInfoService, GroupMemberService groupMemberService,
-                           GroupNoticeService groupNoticeService) {
-        this.groupInfoService = groupInfoService;
-        this.groupMemberService = groupMemberService;
-        this.groupNoticeService = groupNoticeService;
-    }
-
-    @Operation(summary = "创建群组")
-    @PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupCreate(@RequestBody CreateGroup createGroup) {
-        CreateGroupRet createGroupRet = groupInfoService.createGroup(createGroup);
-        return WebResult.success(createGroupRet);
-    }
-
-    @Operation(summary = "群组详细信息")
-    @GetMapping(value = "/detail", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupDetail(@RequestParam("group_id") int groupId) {
-        GroupDetailRet groupDetailRet = groupInfoService.getGroupDetail(groupId);
-        return WebResult.success(groupDetailRet);
-    }
-
-    @Operation(summary = "群组信息设置")
-    @PostMapping(value = "/setting", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupSetting(@RequestBody GroupSetting groupSetting) {
-        groupInfoService.editGroupDetail(groupSetting);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "(群主)解散群组")
-    @PostMapping(value = "/dismiss", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupDismiss() {
-        // TODO 前端未实现该接口
-        return WebResult.success();
-    }
-
-    @Operation(summary = "用户所在的群组")
-    @GetMapping(value = "/list", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupList() {
-        GroupInfoRetList groupInfoRetList = groupMemberService.getGroups();
-        return WebResult.success(groupInfoRetList);
-    }
-
-    @Operation(summary = "群成员")
-    @GetMapping(value = "/member/list", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupMemberList(@RequestParam("group_id") long groupId) {
-        List<GroupMemberRet> memberList = groupMemberService.getGroupMember(groupId);
-        return WebResult.success(memberList);
-    }
-
-    @Operation(summary = "获取需要邀请入群的用户")
-    @GetMapping(value = "/member/invites", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupMemberInvites(@RequestParam("group_id") long groupId) {
-        List<ContactInfo> list = groupMemberService.getInvitedUsers(groupId);
-        return WebResult.success(list);
-    }
-
-    @Operation(summary = "邀请用户进群")
-    @PostMapping(value = "/invite", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupInvite(@RequestBody GroupInvite groupInvite) {
-        groupMemberService.inviteUsers(groupInvite);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "(群成员)退出群组")
-    @PostMapping(value = "/secede", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupSecede(@RequestBody SecedeGroup secedeGroup) {
-        groupMemberService.leaveGroup(secedeGroup);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "(群主)移除群成员")
-    @PostMapping(value = "/member/remove", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupMemberRemove(@RequestBody RemoveMember removeMember) {
-        groupMemberService.removeMembers(removeMember);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "修改群组内显示的昵称")
-    @PostMapping(value = "/member/remark", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupMemberRemark(@RequestBody MemberRemark memberRemark) {
-        groupMemberService.setNicknameInGroup(memberRemark);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "群公告")
-    @GetMapping(value = "/notice/list", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupNoticeList(@RequestParam("group_id") int groupId) {
-        NoticeListRet noticeListRet = groupNoticeService.getNoticeList(groupId);
-        return WebResult.success(noticeListRet);
-    }
-
-    @Operation(summary = "添加/修改群公告")
-    @PostMapping(value = "/notice/edit", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String groupNoticeEdit(@RequestBody EditGroupNotice editGroupNotice) {
-        groupNoticeService.createOrUpdateNotice(editGroupNotice);
-        return WebResult.success();
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/controller/HongbaoController.java

@@ -1,35 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.controller;
-
-import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.file.app.zchat.model.dto.HongbaoDto;
-import cn.reghao.tnb.file.app.zchat.service.HongbaoService;
-import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:28:53
- */
-@RestController
-@RequestMapping("/api/chat/hongbao")
-public class HongbaoController {
-    private final HongbaoService hongbaoService;
-
-    public HongbaoController(HongbaoService hongbaoService) {
-        this.hongbaoService = hongbaoService;
-    }
-
-    @PostMapping(value = "/add", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String addHongbao(@RequestBody @Validated HongbaoDto hongbaoDto) {
-        Result result = hongbaoService.addHongbao(hongbaoDto);
-        return WebResult.result(result);
-    }
-
-    @PostMapping(value = "/get/{hongbaoId}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getHongbao(@PathVariable("hongbaoId") Long hongbaoId) {
-        Result result = hongbaoService.getHongbao(hongbaoId);
-        return WebResult.result(result);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/ChatCallMapper.java

@@ -0,0 +1,17 @@
+package cn.reghao.tnb.file.app.zchat.db.mapper;
+
+import cn.reghao.jutil.jdk.web.db.BaseMapper;
+import cn.reghao.tnb.file.app.zchat.model.po.ChatCall;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2026-06-11 09:59:32
+ */
+@Mapper
+public interface ChatCallMapper extends BaseMapper<ChatCall> {
+    ChatCall findByMessageId(long messageId);
+    List<ChatCall> findByMessageIds(List<Long> messageIds);
+}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/ChatDialogueMapper.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zchat.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.chat.ChatDialogue;
+import cn.reghao.tnb.file.app.zchat.model.po.ChatDialogue;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/ChatFileMapper.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zchat.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.message.ChatFile;
+import cn.reghao.tnb.file.app.zchat.model.po.ChatFile;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/ChatMessageMapper.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.file.app.zchat.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
 import cn.reghao.jutil.jdk.web.db.Page;
-import cn.reghao.tnb.file.app.zchat.model.dto.chat.ChatRecord;
-import cn.reghao.tnb.file.app.zchat.model.po.chat.ChatMessage;
+import cn.reghao.tnb.file.app.zchat.model.vo.ChatRecord;
+import cn.reghao.tnb.file.app.zchat.model.po.ChatMessage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,7 +17,7 @@ import java.util.List;
 public interface ChatMessageMapper extends BaseMapper<ChatMessage> {
     void updateSetRevoke(long messageId);
 
-    List<ChatMessage> findChatMessagesLatest(@Param("chatId") long chatId, @Param("pageSize") int pageSize);
+    List<ChatMessage> findChatMessagesOldest(@Param("chatId") long chatId, @Param("pageSize") int pageSize);
     int countByChatId(long chatId);
     List<ChatMessage> findChatMessagesPrev(@Param("chatId") long chatId,
                                            @Param("currentMessageId") long currentMessageId,
@@ -34,4 +34,8 @@ public interface ChatMessageMapper extends BaseMapper<ChatMessage> {
     @Deprecated
     List<ChatRecord> findChatRecordGetRetByMsgType(int msgType, long receiverId, long userId, long lastMessageId, int limit);
     ChatMessage findByMessageId(long messageId);
+
+    List<ChatMessage> findContentByPage(@Param("page") Page page,
+                                        @Param("userId") long userId,
+                                        @Param("content") String content);
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/ChatTransferMapper.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zchat.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.message.ChatTransfer;
+import cn.reghao.tnb.file.app.zchat.model.po.ChatTransfer;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/CodeBlockMessageMapper.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.message.CodeBlockMessage;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author reghao
- * @date 2022-04-21 16:08:23
- */
-@Mapper
-public interface CodeBlockMessageMapper extends BaseMapper<CodeBlockMessage> {
-    CodeBlockMessage findByMessageId(long messageId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/GroupInfoMapper.java

@@ -1,24 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.dto.ChatUserInfo;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.GroupDetailRet;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.GroupInfoRet;
-import cn.reghao.tnb.file.app.zchat.model.po.GroupInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-21 20:52:07
- */
-@Mapper
-public interface GroupInfoMapper extends BaseMapper<GroupInfo> {
-    void updateGroupInfo(GroupInfo groupInfo);
-
-    GroupInfo findByGroupId(long groupId);
-    GroupDetailRet findDetailByGroupId(long groupId);
-    List<GroupInfoRet> findGroupsByUserId(long userId);
-    ChatUserInfo findDialogGroupInfo(long groupId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/GroupMemberMapper.java

@@ -1,22 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.GroupMemberRet;
-import cn.reghao.tnb.file.app.zchat.model.po.GroupMember;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-21 20:52:07
- */
-@Mapper
-public interface GroupMemberMapper extends BaseMapper<GroupMember> {
-    void updateSetMemberRemark(long groupId, long userId, String nickname);
-    void deleteGroupMembers(long groupId, List<Long> list);
-
-    GroupMember findByGroupAndUserId(long groupId, long userId);
-    List<Long> findUserIdsByGroupId(long groupId);
-    List<GroupMemberRet> findByGroupId(long groupId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/GroupNoticeMapper.java

@@ -1,21 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.NoticeRet;
-import cn.reghao.tnb.file.app.zchat.model.po.GroupNotice;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-28 17:16:17
- */
-@Mapper
-public interface GroupNoticeMapper extends BaseMapper<GroupNotice> {
-    void updateSetNotice(GroupNotice groupNotice);
-
-    GroupNotice findByNoticeId(int noticeId);
-    List<NoticeRet> findByGroupId(long groupId);
-    NoticeRet findByLatest(long groupId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/HongbaoMapper.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.Hongbao;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:41:47
- */
-@Mapper
-public interface HongbaoMapper extends BaseMapper<Hongbao> {
-    void updateHongbaoRemainDecr(@Param("hongbaoId") long hongbaoId);
-    Hongbao findHongbaoById(long hongbaoId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/HongbaoReceiverMapper.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.HongbaoReceiver;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:57:42
- */
-@Mapper
-public interface HongbaoReceiverMapper extends BaseMapper<HongbaoReceiver> {
-    List<HongbaoReceiver> findByHongbaoId(long hongbaoId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/db/mapper/SettingMapper.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.db.mapper;
-
-import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.file.app.zchat.model.po.Setting;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author reghao
- * @date 2022-04-18 11:01:04
- */
-@Mapper
-public interface SettingMapper extends BaseMapper<Setting> {
-    Setting findByUserId(long userId);
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/ApplyStatus.java

@@ -1,24 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.constant;
-
-/**
- * @author reghao
- * @date 2023-11-30 14:01:31
- */
-public enum ApplyStatus {
-    newApply(1),
-    acceptApply(2),
-    declineApply(3);
-
-    private final int value;
-    ApplyStatus(int value) {
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name();
-    }
-
-    public int getValue() {
-        return value;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/ChatMsgType.java

@@ -13,6 +13,8 @@ public enum ChatMsgType {
     chatHongbao(3, "红包"),
     chatLink(4, "链接"),
     chatRecord(5, "聊天记录"),
+    audioCall(6, "语音通话"),
+    videoCall(7, "视频通话"),
     file(21, "文件"),
     image(22, "图片"),
     audio(23, "音频"),

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/FileMsgType.java

@@ -1,42 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2022-04-20 14:57:36
- */
-public enum FileMsgType {
-    image(1, "图片"),
-    audio(2, "音频"),
-    video(3, "视频"),
-    docWord(4, "word 文档"),
-    docExcel(4, "excel 文档"),
-    docPdf(4, "pdf 文档"),
-    attachment(9, "附件");
-
-    private final Integer code;
-    private final String desc;
-
-    private static Map<Integer, String> descMap = new HashMap<>();
-    static {
-        for (FileMsgType type : FileMsgType.values()) {
-            descMap.put(type.code, type.desc);
-        }
-    }
-
-    FileMsgType(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    // TODO 第一次调用时会初始化 descMap
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/FriendStatus.java

@@ -1,23 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.constant;
-
-/**
- * @author reghao
- * @date 2023-11-30 14:01:03
- */
-public enum FriendStatus {
-    normal(1),
-    block(2);
-
-    private final int value;
-    FriendStatus(int value) {
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name();
-    }
-
-    public int getValue() {
-        return value;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/MsgType.java

@@ -1,45 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 聊天消息类型
- *
- * @author reghao
- * @date 2022-04-17 16:47:55
- */
-public enum MsgType {
-    all(0, "所有消息"),
-    text(1, "文本消息"),
-    media(2, "音频/视频/图片/文件消息"),
-    chatRecord(3, "聊天记录"),
-    codeBlock(4, "代码块"),
-    vote(5, "投票"),
-    //login(8, "登入"),
-    location(10, "位置");
-
-    private final Integer code;
-    private final String desc;
-
-    private static Map<Integer, String> descMap = new HashMap<>();
-    static {
-        for (MsgType gender : MsgType.values()) {
-            descMap.put(gender.code, gender.desc);
-        }
-    }
-
-    MsgType(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    // TODO 第一次调用时会初始化 descMap
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/constant/ReceiverType.java

@@ -1,54 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:36:28
- */
-public enum ReceiverType {
-    Group(1, "群红包"),
-    Single(2, "个人红包");
-
-    private final int code;
-    private final String desc;
-    private static final Map<Integer, ReceiverType> map = new HashMap<>();
-    static {
-        for (ReceiverType type : ReceiverType.values()) {
-            map.put(type.code, type);
-        }
-    }
-
-    ReceiverType(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public String getName() {
-        return this.name();
-    }
-
-    /**
-     * 提供给 @ValidEnum 调用
-     *
-     * @param
-     * @return
-     * @date 2023-10-11 14:44:42
-     */
-    public int getValue() {
-        return this.code;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public static ReceiverType getByCode(int code) {
-        return map.get(code);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatRecordGet.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/ChatRecordGet.java

@@ -1,10 +1,6 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
+package cn.reghao.tnb.file.app.zchat.model.dto;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
 
 /**
  * @author reghao
@@ -14,7 +10,5 @@ import java.io.Serializable;
 public class ChatRecordGet {
     private Long messageId;
     private Long chatId;
-    private Long receiverId;
-    private Integer msgType;
     private String direction;
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/HongbaoDto.java

@@ -1,30 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto;
-
-import cn.reghao.jutil.jdk.web.validator.ValidEnum;
-import cn.reghao.tnb.file.app.zchat.model.constant.ReceiverType;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:31:28
- */
-@NoArgsConstructor
-@Setter
-@Getter
-public class HongbaoDto {
-    @ValidEnum(value = ReceiverType.class, message = "红包接收人不正确")
-    private Integer receiverType;
-    @NotNull
-    private Long receiverId;
-    @NotNull
-    private Double amount;
-    @NotNull
-    private Integer num;
-    @Size(min = 1, max = 20, message = "祝福语不能超过20个字符")
-    private String remark;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/Paginate.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 15:55:52
- */
-@Data
-@Deprecated
-public class Paginate {
-    private int page;
-    private int size;
-    private int total;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/UnreadNum.java

@@ -1,12 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:31:34
- */
-@AllArgsConstructor
-public class UnreadNum {
-    private int unreadNum;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/auth/LoginDto.java

@@ -1,19 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.auth;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-16 21:53:02
- */
-@Data
-@Deprecated
-public class LoginDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String mobile;
-    private String password;
-    private String platform;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/auth/LoginRetDto.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.auth;
-
-import cn.reghao.tnb.file.app.zchat.model.dto.user.UserInfo;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 21:53:54
- */
-@Data
-@Deprecated
-public class LoginRetDto {
-    private String accessToken;
-    private long expiresIn;
-    private String type;
-    private UserInfo userInfo;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatDelete.java

@@ -1,12 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-29 11:05:10
- */
-@Getter
-public class ChatDelete {
-    private int listId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatDisturb.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:41:48
- */
-@Data
-public class ChatDisturb {
-    private int isDisturb;
-    private int receiverId;
-    private int talkType;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatInitial.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-18 17:37:13
- */
-@Data
-public class ChatInitial implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private long receiverId;
-    private int talkType;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatRecordDelete.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 17:17:14
- */
-@Data
-public class ChatRecordDelete {
-    private int talkType;
-    private int receiverId;
-    private String messageId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatRecordGetRetList.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:18:31
- */
-@Data
-public class ChatRecordGetRetList {
-    private long messageId;
-    private int limit;
-    private List<ChatRecord> rows;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatRecordRevoke.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-21 15:41:17
- */
-@Getter
-public class ChatRecordRevoke implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private long messageId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatTop.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 19:02:59
- */
-@Getter
-public class ChatTop {
-    private int type;
-    private int listId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatUnreadClear.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:33:33
- */
-@Data
-public class ChatUnreadClear implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private long receiverId;
-    private int talkType;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/chat/ChatUserInfo.java

@@ -1,27 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.chat;
-
-import cn.reghao.tnb.user.api.dto.ContactDetail;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-30 10:38:24
- */
-@NoArgsConstructor
-@Getter
-public class ChatUserInfo {
-    private String receiverId;
-    private String name;
-    private String avatar;
-    private boolean isOnline;
-    private String remarkName;
-
-    public ChatUserInfo(ContactDetail contactDetail) {
-        this.receiverId = contactDetail.getUserId();
-        this.name = contactDetail.getScreenName();
-        this.avatar = contactDetail.getAvatarUrl();
-        this.isOnline = true;
-        this.remarkName = "";
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactAdd.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-18 14:34:47
- */
-@Data
-public class ContactAdd implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long friendId;
-    private String remark;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactAddRespond.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-18 14:34:47
- */
-@Getter
-public class ContactAddRespond implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private int apply_id;
-    private String remark;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactApplyInfo.java

@@ -1,18 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 15:54:07
- */
-@Data
-public class ContactApplyInfo {
-    private long id;
-    private long userId;
-    private int friendId;
-    private String nickname;
-    private String avatar;
-    private String remark;
-    private String createdAt;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactApplyList.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import cn.reghao.tnb.file.app.zchat.model.dto.Paginate;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-17 15:54:07
- */
-@Data
-public class ContactApplyList {
-    private List<ContactApplyInfo> rows;
-    private Paginate paginate;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactInfo.java

@@ -1,22 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-16 23:04:42
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-public class ContactInfo {
-    private long id;
-    private String nickname;
-    private int gender;
-    private String motto;
-    private String avatar;
-    private String friendRemark;
-    private boolean isOnline;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/ContactInfoResult.java

@@ -1,20 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 23:04:42
- */
-@Data
-public class ContactInfoResult {
-    private long id;
-    private String mobile;
-    private String nickname;
-    private int gender;
-    private String motto;
-    private String avatar;
-    private int friendStatus;
-    private String nicknameRemark;
-    private int friendApply;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/contact/SearchContactResult.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.contact;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 23:04:42
- */
-@Data
-public class SearchContactResult {
-    private long id;
-    private String mobile;
-    private String nickname;
-    private int gender;
-    private String motto;
-    private String avatar;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/emoticon/EmoticonInfo.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.emoticon;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:13:24
- */
-@AllArgsConstructor
-@Data
-public class EmoticonInfo {
-    private int mediaId;
-    private String src;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/emoticon/EmoticonList.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.emoticon;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:13:58
- */
-@Data
-public class EmoticonList {
-    private List<EmoticonInfo> collectEmoticon;
-    private List<EmoticonInfo> sysEmoticon;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/CreateGroup.java

@@ -1,19 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-21 20:37:31
- */
-@Getter
-public class CreateGroup implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String avatar;
-    private String ids;
-    private String name;
-    private String profile;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/CreateGroupRet.java

@@ -1,12 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-29 11:09:46
- */
-@AllArgsConstructor
-public class CreateGroupRet {
-    private long groupId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/EditGroupNotice.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 17:05:44
- */
-@Getter
-public class EditGroupNotice {
-    private int groupId;
-    private int noticeId;
-    private String title;
-    private String content;
-    private boolean isTop;
-    private boolean isConfirm;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupDetailRet.java

@@ -1,27 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-28 16:40:08
- */
-@Getter
-@Setter
-public class GroupDetailRet {
-    private long groupId;
-    private String groupName;
-    private String avatar;
-    private String profile;
-    private String createdAt;
-    private NoticeRet notice;
-
-    private long ownerId;
-    private String managerNickname;
-    private boolean isManager;
-    // 用户是否设置群消息免打扰
-    private boolean isDisturb;
-    // 用户的群昵称
-    private String visitCard;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupInfoRet.java

@@ -1,21 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:57:06
- */
-@Data
-public class GroupInfoRet {
-    private long id;
-    private String groupName;
-    private String avatar;
-    private String groupProfile;
-    // 0 - 加入群, 1 - 管理群, 2 - 创建群
-    private int leader;
-    // 1 - 开启免打扰, 2 - 关闭免打扰
-    private int isDisturb;
-    private boolean owner;
-    private boolean disturb;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupInfoRetList.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-29 11:08:27
- */
-@AllArgsConstructor
-public class GroupInfoRetList {
-    List<GroupInfoRet> rows;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupInvite.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 16:52:08
- */
-@Getter
-public class GroupInvite {
-    private int groupId;
-    private String ids;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupMemberRet.java

@@ -1,23 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-28 16:45:58
- */
-@Getter
-@Setter
-public class GroupMemberRet {
-    private long id;
-    private long userId;
-    private String nickname;
-    private String avatar;
-    private String gender;
-    private String motto;
-
-    private boolean owner;
-    private int leader;
-    private String userCard;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/GroupSetting.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 16:56:58
- */
-@Getter
-public class GroupSetting {
-    private int groupId;
-    private String groupName;
-    private String profile;
-    private String avatar;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/MemberRemark.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-29 18:38:22
- */
-@Getter
-public class MemberRemark {
-    private long groupId;
-    private String visitCard;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/NoticeListRet.java

@@ -1,14 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-29 11:11:15
- */
-@AllArgsConstructor
-public class NoticeListRet {
-    List<NoticeRet> rows;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/NoticeRet.java

@@ -1,24 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-29 11:32:07
- */
-@Setter
-@Getter
-public class NoticeRet {
-    private int id;
-    private String title;
-    private String content;
-    private boolean isConfirm;
-    private boolean isTop;
-    private String createdAt;
-    private String updatedAt;
-
-    private long userId;
-    private String nickname;
-    private String avatar;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/RemoveMember.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 17:45:19
- */
-@Getter
-public class RemoveMember {
-    private long groupId;
-    private String membersIds;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/group/SecedeGroup.java

@@ -1,12 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.group;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-28 17:41:28
- */
-@Getter
-public class SecedeGroup {
-    private Long groupId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/ChatMsg.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:57:42
- */
-@NoArgsConstructor
-@Getter
-public class ChatMsg {
-    protected Long receiverId;
-    protected Integer talkType;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/ChatRecordMsg.java

@@ -1,11 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:57:20
- */
-public class ChatRecordMsg extends ChatMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/CodeBlockMsg.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:56:34
- */
-@Getter
-public class CodeBlockMsg extends ChatMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String lang;
-    private String code;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/CodeBlockResult.java

@@ -1,26 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.file.app.zchat.model.po.message.CodeBlockMessage;
-
-/**
- * @author reghao
- * @date 2022-04-21 16:15:11
- */
-public class CodeBlockResult {
-    private int id;
-    private long userId;
-    private long messageId;
-    private String lang;
-    private String code;
-    private String ceatedAt;
-
-    public CodeBlockResult(CodeBlockMessage codeBlockMessage, long senderId) {
-        this.id = codeBlockMessage.getId();
-        this.userId = senderId;
-        this.messageId = codeBlockMessage.getMessageId();
-        this.lang = codeBlockMessage.getLang();
-        this.code = codeBlockMessage.getCode();
-        this.ceatedAt = DateTimeConverter.format(codeBlockMessage.getCreateTime());
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/DateDto.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2024-04-06 18:54:43
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-public class DateDto {
-    private String date;
-    private int count;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/EmoticonMsg.java

@@ -1,16 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 17:07:07
- */
-@Data
-public class EmoticonMsg extends ChatMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private int emoticonId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/FileMsg.java

@@ -1,22 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:56:50
- */
-@NoArgsConstructor
-@Getter
-@Setter
-public class FileMsg extends ChatMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String uploadId;
-    private Integer fileType;
-    private Integer channelCode;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/FileMsgResult.java

@@ -1,45 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import cn.reghao.tnb.file.app.zchat.model.po.message.ChatFile;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-20 14:18:23
- */
-@Getter
-public class FileMsgResult {
-    private String fileId;
-    private long messageId;
-    private long userId;
-    private int drive;
-    private Long id;
-    private String originalName;
-    private String path;
-    private long size;
-    private int source;
-    private String suffix;
-    private int type;
-    private String url;
-    private int width;
-    private int height;
-    private String createdAt;
-
-    public FileMsgResult(ChatFile chatFile, String url, long userId, String createdAt) {
-        this.fileId = chatFile.getUploadId();
-        this.messageId = chatFile.getMessageId();
-        this.userId = userId;
-        this.drive = 1;
-        this.id = chatFile.getMessageId();
-        this.originalName = chatFile.getFilename();
-        this.path = url;
-        this.size = 1;
-        this.source = 1;
-        this.suffix = "";
-        this.type = chatFile.getFileType();
-        this.url = url;
-        this.width = chatFile.getWidth();
-        this.height = chatFile.getHeight();
-        this.createdAt = createdAt;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/ForwardMsg.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 17:15:14
- */
-@Data
-public class ForwardMsg {
-    private int forwardMode;
-    private int receiverId;
-    private int receiverUserIds;
-    private int receiverGroupIds;
-    private int messageIds;
-    private int talkType;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/ImageMessage.java

@@ -1,25 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:56:50
- */
-@Getter
-@Setter
-public class ImageMessage implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @NotNull
-    private Long receiverId;
-    @NotNull
-    private Integer channelCode;
-    @NotBlank
-    private String uploadId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/ImageMsg.java

@@ -1,21 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:56:50
- */
-@Getter
-@Setter
-public class ImageMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private long receiverId;
-    private int talkType;
-    private String uploadId;
-    private Integer channelCode;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/LoginRecord.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:37:18
- */
-@Data
-public class LoginRecord {
-    private String address;
-    private String agent;
-    private String createdAt;
-    private String ip;
-    private String platform;
-    private String reason;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/Record.java

@@ -1,23 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:49:38
- */
-@Data
-public class Record {
-    private String avatar;
-    private String content;
-    private String createAt;
-    private long id;
-    private boolean isMark;
-    private boolean isRead;
-    private boolean isRevoke;
-    private int msgType;
-    private String nickname;
-    private long receiverId;
-    private int talkType;
-    private long userId;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/RecordsRet.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:36:31
- */
-public class RecordsRet {
-    private int messageId;
-    private int limit;
-    private List<Record> rows;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/TextMsg.java

@@ -1,18 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:55:58
- */
-@NoArgsConstructor
-@Getter
-public class TextMsg extends ChatMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String text;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/VoteMsg.java

@@ -1,20 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:57:00
- */
-@Data
-public class VoteMsg implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private int receiverId;
-    private String title;
-    private int mode;
-    private List<String> options;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/message/VoteMsgResult.java

@@ -1,12 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.message;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-17 17:11:27
- */
-public class VoteMsgResult {
-    private int count;
-    private List<String> options;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/user/SmsCode.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.user;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-18 11:21:58
- */
-@Data
-public class SmsCode {
-    private String channel;
-    private String mobile;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/user/UserInfo.java

@@ -1,21 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.user;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:03:22
- */
-@Data
-@Deprecated
-public class UserInfo {
-    private long id;
-    private long userId;
-    private long uid;
-    private String nickname;
-    private int gender;
-    private String motto;
-    private String signature;
-    private String avatar;
-    private int isOnline;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/user/UserRegisterDto.java

@@ -1,21 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.user;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-18 10:52:15
- */
-@Data
-@Deprecated
-public class UserRegisterDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String mobile;
-    private String nickname;
-    private String password;
-    private String platform;
-    private String smsCode;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/dto/user/UserSetting.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.dto.user;
-
-import cn.reghao.tnb.file.app.zchat.model.po.Setting;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:02:30
- */
-@Data
-@Deprecated
-public class UserSetting {
-    private Setting setting;
-    private UserInfo userInfo;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/ChatCall.java

@@ -0,0 +1,22 @@
+package cn.reghao.tnb.file.app.zchat.model.po;
+
+import cn.reghao.jutil.jdk.web.db.BaseObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author reghao
+ * @date 2026-06-11 09:56:41
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class ChatCall extends BaseObject<Integer> {
+    private long messageId;
+    private String callType;
+    private Double duration;
+    private String discardReason;
+}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/chat/ChatDialogue.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/ChatDialogue.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.zchat.model.po.chat;
+package cn.reghao.tnb.file.app.zchat.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.Getter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/message/ChatFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/ChatFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.zchat.model.po.message;
+package cn.reghao.tnb.file.app.zchat.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import cn.reghao.oss.api.dto.ObjectInfo;
@@ -21,18 +21,10 @@ public class ChatFile extends BaseObject<Integer> {
     private String filename;
     private long size;
 
-    private String uploadId;
-    private Integer channelCode;
-    private Integer width;
-    private Integer height;
-
     public ChatFile(int fileType, long messageId, String uploadId, String filename) {
         this.fileType = fileType;
         this.messageId = messageId;
-        this.uploadId = uploadId;
         this.filename = filename;
-        this.width = 0;
-        this.height = 0;
     }
 
     public ChatFile(long messageId, ObjectInfo objectInfo) {

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/chat/ChatMessage.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/ChatMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.zchat.model.po.chat;
+package cn.reghao.tnb.file.app.zchat.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import cn.reghao.tnb.file.app.zchat.model.constant.ChatType;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/message/ChatTransfer.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/ChatTransfer.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.zchat.model.po.message;
+package cn.reghao.tnb.file.app.zchat.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.Getter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/GroupInfo.java

@@ -1,32 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.CreateGroup;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-04-21 20:49:10
- */
-@NoArgsConstructor
-@Getter
-@Setter
-public class GroupInfo extends BaseObject<Integer> {
-    private long groupId;
-    private String name;
-    private String avatar;
-    private String profile;
-    private long ownerId;
-    private List<Long> memberIds;
-
-    public GroupInfo(CreateGroup createGroup, long userId) {
-        this.name = createGroup.getName();
-        this.avatar = createGroup.getAvatar();
-        this.profile = createGroup.getProfile();
-        this.ownerId = userId;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/GroupMember.java

@@ -1,26 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-21 20:49:10
- */
-@NoArgsConstructor
-@Getter
-public class GroupMember extends BaseObject<Integer> {
-    private Long groupId;
-    private Long userId;
-    private String nickname;
-    private boolean owner;
-    private boolean disturb;
-
-    public GroupMember(Long groupId, Long userId) {
-        this.groupId = groupId;
-        this.userId = userId;
-        this.owner = false;
-        this.disturb = false;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/GroupNotice.java

@@ -1,32 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import cn.reghao.tnb.file.app.zchat.model.dto.group.EditGroupNotice;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-28 17:11:09
- */
-@NoArgsConstructor
-@Getter
-public class GroupNotice extends BaseObject<Integer> {
-    private Integer noticeId;
-    private Integer groupId;
-    private String title;
-    private String content;
-    private Boolean top;
-    private Boolean confirmed;
-    private Long createBy;
-
-    public GroupNotice(EditGroupNotice editGroupNotice, long userId) {
-        this.noticeId = editGroupNotice.getNoticeId();
-        this.groupId = editGroupNotice.getGroupId();
-        this.title = editGroupNotice.getTitle();
-        this.content = editGroupNotice.getContent();
-        this.top = editGroupNotice.isTop();
-        this.confirmed = editGroupNotice.isConfirm();
-        this.createBy = userId;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/Hongbao.java

@@ -1,43 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.zchat.model.dto.HongbaoDto;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:41:06
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Setter
-@Getter
-public class Hongbao extends BaseObject<Integer> {
-    private long hongbaoId;
-    private Integer receiverType;
-    private Long receiverId;
-    private Double amount;
-    private Integer num;
-    private Integer remain;
-    private String remark;
-    private long createBy;
-    private LocalDateTime createAt;
-
-    public Hongbao(long hongbaoId, HongbaoDto hongbaoDto) {
-        this.hongbaoId = hongbaoId;
-        this.receiverType = hongbaoDto.getReceiverType();
-        this.receiverId = hongbaoDto.getReceiverId();
-        this.amount = hongbaoDto.getAmount();
-        this.num = hongbaoDto.getNum();
-        this.remain = hongbaoDto.getNum();
-        this.remark = hongbaoDto.getRemark();
-        this.createBy = UserContext.getUserId();
-        this.createAt = LocalDateTime.now();
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/HongbaoReceiver.java

@@ -1,32 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import cn.reghao.tnb.common.auth.UserContext;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-/**
- * @author reghao
- * @date 2024-12-03 14:56:39
- */
-@NoArgsConstructor
-@Setter
-@Getter
-public class HongbaoReceiver extends BaseObject<Integer> {
-    private long hongbaoId;
-    private Long receiverId;
-    private Double amount;
-    private String remark;
-    private LocalDateTime createAt;
-
-    public HongbaoReceiver(long hongbaoId, double amount) {
-        this.hongbaoId = hongbaoId;
-        this.receiverId = UserContext.getUserId();
-        this.amount = amount;
-        this.remark = "";
-        this.createAt = LocalDateTime.now();
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/Setting.java

@@ -1,20 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-16 22:03:13
- */
-@Getter
-@Setter
-public class Setting extends BaseObject<Integer> {
-    private Long userId;
-    private String keyboardEventNotify;
-    private String notifyCueTone;
-    private String themeBagImg;
-    private String themeColor;
-    private String themeMode;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/contact/UserContact.java

@@ -1,24 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po.contact;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-18 10:59:35
- */
-@Getter
-@Setter
-public class UserContact extends BaseObject<Integer> {
-    private Long userId;
-    private Long friendId;
-    private String remark;
-    private Integer status;
-    private Boolean online;
-
-    public UserContact() {
-        this.status = 2;
-        this.online = false;
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/emoticon/Emoticon.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po.emoticon;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2022-04-17 16:13:24
- */
-@Data
-public class Emoticon {
-    private int mediaId;
-    private String src;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/po/message/CodeBlockMessage.java

@@ -1,19 +0,0 @@
-package cn.reghao.tnb.file.app.zchat.model.po.message;
-
-import cn.reghao.jutil.jdk.web.db.BaseObject;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-04-21 16:06:34
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-public class CodeBlockMessage extends BaseObject<Integer> {
-    private long messageId;
-    private String lang;
-    private String code;
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zchat/model/vo/ChatDialogueInfo.java

@@ -0,0 +1,33 @@
+package cn.reghao.tnb.file.app.zchat.model.vo;
+
+import cn.reghao.tnb.file.app.zchat.model.po.ChatDialogue;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2026-06-11 14:01:34
+ */
+@Data
+public class ChatDialogueInfo {
+    private long chatId;
+    private int chatType;
+    private boolean disturb;
+    private boolean robot;
+    private boolean top;
+    private boolean display;
+    private int unreadNum;
+    private long lastMessageId;
+    private UserAvatar receiver;
+
+    public ChatDialogueInfo(ChatDialogue chatDialogue, UserAvatar receiver) {
+        this.chatId = chatDialogue.getChatId();
+        this.chatType = chatDialogue.getChatType();
+        this.disturb = chatDialogue.isDisturb();
+        this.robot = chatDialogue.isRobot();
+        this.top = chatDialogue.isTop();
+        this.display = chatDialogue.isDisplay();
+        this.unreadNum = chatDialogue.getUnreadNum();
+        this.lastMessageId = chatDialogue.getLastMessageId();
+        this.receiver = receiver;
+    }
+}