From 41a21f4d8e19a657c123507d3f75078125008271 Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 7 Aug 2026 10:58:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=87=8D=E6=9E=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=8E=A5=E5=8F=A3=E5=B9=B6=E7=BB=9F=E4=B8=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整前端会议接口类型,新增 MeetingParticipant 定义 - 统一全项目文件换行符为 LF,清理 CRLF 格式 - 完善 .gitignore 规则与 H5 端基础类型定义 --- .../dto/biz/MeetingParticipantVO.java | 19 +++++++++++++++++++ .../biz/impl/MeetingDomainSupport.java | 5 +---- frontend/src/api/business/meeting.ts | 4 ++-- imeeting-h5/src/types/index.ts | 4 ++-- 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 backend/src/main/java/com/imeeting/dto/biz/MeetingParticipantVO.java diff --git a/backend/src/main/java/com/imeeting/dto/biz/MeetingParticipantVO.java b/backend/src/main/java/com/imeeting/dto/biz/MeetingParticipantVO.java new file mode 100644 index 0000000..604b77b --- /dev/null +++ b/backend/src/main/java/com/imeeting/dto/biz/MeetingParticipantVO.java @@ -0,0 +1,19 @@ +package com.imeeting.dto.biz; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Schema(description = "会议参会人信息") +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MeetingParticipantVO { + + @Schema(description = "用户 ID") + private Long userId; + + @Schema(description = "用户名称") + private String displayName; +} diff --git a/backend/src/main/java/com/imeeting/service/biz/impl/MeetingDomainSupport.java b/backend/src/main/java/com/imeeting/service/biz/impl/MeetingDomainSupport.java index 0105a2d..e4d2dff 100644 --- a/backend/src/main/java/com/imeeting/service/biz/impl/MeetingDomainSupport.java +++ b/backend/src/main/java/com/imeeting/service/biz/impl/MeetingDomainSupport.java @@ -1,13 +1,11 @@ package com.imeeting.service.biz.impl; -import cn.hutool.core.date.StopWatch; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.imeeting.common.MeetingConstants; import com.imeeting.common.SysParamKeys; import com.imeeting.entity.biz.AiTask; import com.imeeting.entity.biz.HotWordGroup; import com.imeeting.entity.biz.Meeting; -import com.imeeting.entity.biz.MeetingTranscript; import com.imeeting.entity.biz.PromptTemplate; import com.imeeting.dto.biz.MeetingParticipantVO; import com.imeeting.event.MeetingCreatedEvent; @@ -46,7 +44,6 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.Comparator; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -476,7 +473,7 @@ public class MeetingDomainSupport { .collect(Collectors.toList()); vo.setParticipantUsers(participantUsers); String names = participantUsers.stream() - .map(MeetingParticipantVO::getName) + .map(MeetingParticipantVO::getDisplayName) .filter(Objects::nonNull) .collect(Collectors.joining(", ")); vo.setParticipants(names); diff --git a/frontend/src/api/business/meeting.ts b/frontend/src/api/business/meeting.ts index 8fbf189..b76562c 100644 --- a/frontend/src/api/business/meeting.ts +++ b/frontend/src/api/business/meeting.ts @@ -8,8 +8,8 @@ export type SummaryDetailLevel = "DETAILED" | "STANDARD" | "BRIEF"; export type MeetingSource = "WINDOWS" | "MACOS" | "KYLIN" | "UOS" | "HARMONYOS" | "WEB" | "CUSTOM_TERMINAL" | "ANDROID"; export interface MeetingParticipant { - id: number; - name: string | null; + userId: number; + displayName: string | null; } export interface MeetingCreateConfig { diff --git a/imeeting-h5/src/types/index.ts b/imeeting-h5/src/types/index.ts index ed436e1..83e0dd7 100644 --- a/imeeting-h5/src/types/index.ts +++ b/imeeting-h5/src/types/index.ts @@ -26,8 +26,8 @@ export interface TokenResponse { } export interface MeetingParticipant { - id: number; - name: string | null; + userId: number; + displayName: string | null; } export interface MeetingVO {