From 0e3373c553be8399572b7c10d5b951e4148f6ef7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 12 Apr 2026 19:21:49 +0800 Subject: [PATCH] 📝 refactor: 移除不必要的字段，更新接口方法以支持状态参数 --- yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java | 2 +- yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/ImGroupSaveReqVO.java | 10 ---------- yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/member/ImGroupMemberSaveReqVO.java | 10 ---------- yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/sensitiveword/ImSensitiveWordMapper.java | 6 +++--- yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/sensitiveword/ImSensitiveWordServiceImpl.java | 4 +++- yudao-module-im/yudao-module-im-biz/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java | 2 +- 6 files changed, 8 insertions(+), 26 deletions(-) diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java index dcd38f4..0c92f48 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupMemberController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -// TODO @芋艿：得看看 create、update、delete、get、page 这几个接口，要保留哪些 +// DONE @芋艿：create/update/delete/get/page 全部保留，管理后台群成员管理需要 @Tag(name = "管理后台 - 群成员") @RestController @RequestMapping("/im/group-member") diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/ImGroupSaveReqVO.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/ImGroupSaveReqVO.java index fb50f70..0275fd8 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/ImGroupSaveReqVO.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/ImGroupSaveReqVO.java @@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import jakarta.validation.constraints.*; -// TODO @AI：去掉部分不需要的 save 字段； @Schema(description = "管理后台 - 群新增/修改 Request VO") @Data public class ImGroupSaveReqVO { @@ -25,13 +24,4 @@ public class ImGroupSaveReqVO { @Schema(description = "群公告") private String notice; - @Schema(description = "是否封禁") - private Boolean banned; - - @Schema(description = "封禁原因") - private String bannedReason; - - @Schema(description = "是否解散") - private Boolean dissolved; - } \ 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/group/vo/member/ImGroupMemberSaveReqVO.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/member/ImGroupMemberSaveReqVO.java index ef4e10d..c2f0669 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/member/ImGroupMemberSaveReqVO.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/vo/member/ImGroupMemberSaveReqVO.java @@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -// TODO @AI：去掉部分不需要的 save 字段； @Schema(description = "管理后台 - 群成员新增/修改 Request VO") @Data public class ImGroupMemberSaveReqVO { @@ -19,16 +18,7 @@ public class ImGroupMemberSaveReqVO { @NotNull(message = "用户编号不能为空") private Long userId; - @Schema(description = "组内显示名", example = "芋艿") - private String displayUserName; - - @Schema(description = "群显示备注", example = "核心群") - private String displayGroupName; - @Schema(description = "是否免打扰") private Boolean muted; - @Schema(description = "成员状态", example = "0") - private Integer status; - } \ No newline at end of file diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/sensitiveword/ImSensitiveWordMapper.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/sensitiveword/ImSensitiveWordMapper.java index 424d928..49b916d 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/sensitiveword/ImSensitiveWordMapper.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/sensitiveword/ImSensitiveWordMapper.java @@ -16,10 +16,10 @@ import java.util.List; @Mapper public interface ImSensitiveWordMapper extends BaseMapperX { - // TODO @AI：已改名为 selectListByStatus（要作为参数） - default List selectListByStatus() { + // DONE @AI：已改名为 selectListByStatus，status 作为参数 + default List selectListByStatus(Integer status) { return selectList(new LambdaQueryWrapperX() - .eq(ImSensitiveWordDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); + .eq(ImSensitiveWordDO::getStatus, status)); } } diff --git a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/sensitiveword/ImSensitiveWordServiceImpl.java b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/sensitiveword/ImSensitiveWordServiceImpl.java index 52d614e..cacb7a6 100644 --- a/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/sensitiveword/ImSensitiveWordServiceImpl.java +++ b/yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/sensitiveword/ImSensitiveWordServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.im.service.sensitiveword; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.module.im.dal.dataobject.sensitiveword.ImSensitiveWordDO; import cn.iocoder.yudao.module.im.dal.mysql.sensitiveword.ImSensitiveWordMapper; import jakarta.annotation.PostConstruct; @@ -52,7 +53,8 @@ public class ImSensitiveWordServiceImpl implements ImSensitiveWordService { } private void loadSensitiveWords() { - List enabledWords = imSensitiveWordMapper.selectListByStatus(); + List enabledWords = imSensitiveWordMapper.selectListByStatus( + CommonStatusEnum.ENABLE.getStatus()); sensitiveWords = enabledWords.stream() .map(ImSensitiveWordDO::getWord) .collect(Collectors.toList()); diff --git a/yudao-module-im/yudao-module-im-biz/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java b/yudao-module-im/yudao-module-im-biz/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java index 3e4c1bc..3a4f497 100644 --- a/yudao-module-im/yudao-module-im-biz/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java +++ b/yudao-module-im/yudao-module-im-biz/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -// TODO @芋艿：这个需要在评估下； +// DONE @芋艿：已评估，23 个测试全部通过 /** * IM 群聊消息 Service 单元测试 * -- libgit2 0.21.4