论坛相关

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/dto/DynamicInfoDTO.java

@@ -11,6 +11,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @Author LW
  *

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

 package com.mmc.csf.release.controller;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.forum.vo.CommentVO;
 import com.mmc.csf.release.forum.vo.DynamicVO;
 import com.mmc.csf.release.service.DynamicService;
-import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import io.swagger.annotations.*;
 
 /**
  * @Author LW

release-service/src/main/java/com/mmc/csf/release/dao/DynamicDAO.java

 package com.mmc.csf.release.dao;
 
+
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumCommentDO.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+
 /**
  * 评论表(ForumCommentDO)实体类
  *

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumDynamicDO.java

@@ -12,7 +12,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-
 /**
  * 动态信息表(ForumDynamicDO)实体类
  *

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumImageDO.java

-package com.mmc.csf.release.entity.forum;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 动态图片表(ForumImageDO)实体类
- *
- * @author lw
- * @since 2023-05-16 09:57:50
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-public class ForumImageDO implements Serializable {
-  private static final long serialVersionUID = 678578415154893126L;
-  /** 主键，自增长 */
-  private Integer id; // todo 删除
-  /** 动态ID，必填 */
-  private Integer dynamicId;
-  /** 图片URL，必填 */
-  private String url;
-  /** 创建时间 */
-  private Date createTime;
-  /** 修改时间 */
-  private Date updateTime;
-  /** 是否删除，默认为0表示未删除 */
-  private Integer deleted; // todo 删除
-}

release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java

 package com.mmc.csf.release.service;
 
-import com.mmc.csf.common.util.page.PageResult;
+import javax.servlet.http.HttpServletRequest;
+
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.forum.vo.CommentVO;
 import com.mmc.csf.release.forum.vo.DynamicVO;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @Author LW
  *

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +24,7 @@ import com.mmc.csf.release.dao.DynamicDAO;
 import com.mmc.csf.release.dao.LikeDAO;
 import com.mmc.csf.release.entity.forum.ForumDynamicDO;
 import com.mmc.csf.release.entity.forum.ForumLikeDO;
+import com.mmc.csf.release.entity.forum.ForumResourceDO;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.forum.dto.DynamicInfoDTO;
 import com.mmc.csf.release.forum.qo.DynamicQO;
@@ -78,7 +80,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
         forumImageList.stream().collect(Collectors.groupingBy(ForumResourceDO::getDynamicId));
     // 获取用户信息
     Set<Integer> ListUserIds =
-        dynamicList.stream().map(ForumDynamicDO::getUserId).collect(Collectors.toSet());
+        dynamicList.stream().map(ForumDynamicDO::getUserAccountId).collect(Collectors.toSet());
     List<Integer> userIdList = new ArrayList<>(ListUserIds);
     BUserAccountQO accountQO = new BUserAccountQO();
     accountQO.setUserIds(userIdList);

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -32,6 +32,7 @@ import com.mmc.csf.release.forum.vo.MediaVO;
 import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
 import com.mmc.csf.release.service.DynamicService;
 
+
 /**
  * @Author LW
  *