✨ feat(im): 继续优化频道的各种代码（v2）

YunaiV
1 parent 865a58a6
Showing 7 changed files with 13 additions and 10 deletions
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/channel/vo/material/ImChannelMaterialPageReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/channel/vo/material/ImChannelMaterialRespVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/channel/vo/material/ImChannelMaterialSaveReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/dataobject/channel/ImChannelMaterialDO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/channel/ImChannelServiceImpl.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/message/MaterialMessage.java
@@ -19,7 +19,7 @@ public class ImChannelMaterialPageReqVO extends PageParam {
     private Long channelId;
     @Schema(description = "内容类型", example = "1")
-    private Integer type; // 参见 ImChannelMaterialContentTypeEnum 枚举类
+    private Integer type; // 参见 ImChannelMaterialTypeEnum 枚举类
     @Schema(description = "标题", example = "活动")
     private String title;
@@ -19,7 +19,7 @@ public class ImChannelMaterialRespVO {
     private String channelName;
     @Schema(description = "内容类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer type; // 参见 ImChannelMaterialContentTypeEnum 枚举类
+    private Integer type; // 参见 ImChannelMaterialTypeEnum 枚举类
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     private String title;
@@ -19,7 +19,7 @@ public class ImChannelMaterialSaveReqVO {
     @Schema(description = "内容类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "内容类型不能为空")
-    private Integer type; // 参见 ImChannelMaterialContentTypeEnum 枚举类
+    private Integer type; // 参见 ImChannelMaterialTypeEnum 枚举类
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "双十一活动来啦")
     @NotBlank(message = "标题不能为空")
 package cn.iocoder.yudao.module.im.dal.dataobject.channel;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.im.enums.channel.ImChannelMaterialContentTypeEnum;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.ImChannelMessageDO;
+import cn.iocoder.yudao.module.im.enums.channel.ImChannelMaterialTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -41,7 +42,7 @@ public class ImChannelMaterialDO extends BaseDO {
     /**
      * 素材内容类型
      * <p>
-     * 枚举 {@link ImChannelMaterialContentTypeEnum}
+     * 枚举 {@link ImChannelMaterialTypeEnum}
      */
     private Integer type;
     /**
@@ -57,11 +58,11 @@ public class ImChannelMaterialDO extends BaseDO {
      */
     private String summary;
     /**
-     * 富文本 HTML；在 {@link ImChannelMaterialContentTypeEnum#CONTENT} 使用
+     * 富文本 HTML；在 {@link ImChannelMaterialTypeEnum#CONTENT} 使用
      */
     private String content;
     /**
-     * 跳转链接；在 {@link ImChannelMaterialContentTypeEnum#LINK} 使用
+     * 跳转链接；在 {@link ImChannelMaterialTypeEnum#LINK} 使用
      */
     private String url;
@@ -13,7 +13,7 @@ import java.util.Arrays;
  */
 @Getter
 @AllArgsConstructor
-public enum ImChannelMaterialContentTypeEnum implements ArrayValuable<Integer> {
+public enum ImChannelMaterialTypeEnum implements ArrayValuable<Integer> {
     /**
      * 站内富文本；点击素材在客户端内置详情页拉 content 渲染
@@ -24,7 +24,7 @@ public enum ImChannelMaterialContentTypeEnum implements ArrayValuable&lt;Integer&gt; {
      */
     LINK(2, "外链");
-    public static final Integer[] ARRAYS = Arrays.stream(values()).map(ImChannelMaterialContentTypeEnum::getType).toArray(Integer[]::new);
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(ImChannelMaterialTypeEnum::getType).toArray(Integer[]::new);
     private final Integer type;
     private final String name;
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.im.controller.admin.manager.channel.vo.channel.Im
 import cn.iocoder.yudao.module.im.dal.dataobject.channel.ImChannelDO;
 import cn.iocoder.yudao.module.im.dal.mysql.channel.ImChannelMapper;
 import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -31,6 +32,7 @@ public class ImChannelServiceImpl implements ImChannelService {
     @Resource
     private ImChannelMapper channelMapper;
     @Resource
+    @Lazy // 延迟加载，解决循环依赖
     private ImChannelMaterialService channelMaterialService;
     // ==================== 用户端 ====================
@@ -17,7 +17,7 @@ public class MaterialMessage {
     /**
      * 素材内容类型
      * <p>
-     * 枚举 {@link cn.iocoder.yudao.module.im.enums.channel.ImChannelMaterialContentTypeEnum}
+     * 枚举 {@link cn.iocoder.yudao.module.im.enums.channel.ImChannelMaterialTypeEnum}
      * 客户端按本字段判定点击行为：CONTENT 走站内详情页拉富文本；LINK 跳 url
      */
     private Integer type;