获取文章列表数据新增文章所属合集信息

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityCollectionMapper.java

@@ -12,8 +12,17 @@ import java.util.List;
 public interface CommunityCollectionMapper extends BaseMapper<CommunityCollection> {
     /**
      * 用户合集
+     *
      * @param userId 用户id
      * @return 用户合集信息
      */
-    List<CommunityCollectionVo> selectUserCollection(@Param("userId") Long userId, @Param("articleId")  Long articleId);
+    List<CommunityCollectionVo> selectUserCollection(@Param("userId") Long userId, @Param("articleId") Long articleId);
+
+    /**
+     * 获取文章对应的合集信息
+     * @param userId 用户id
+     * @param articleId 文章id
+     * @return 合集信息
+     */
+    CommunityCollectionVo selectCollectById(@Param("userId") Long userId, @Param("articleId") Long articleId);
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -99,6 +99,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
 
     @Autowired
     private ICommunityPrivacyService communityPrivacyService;
+    @Autowired
+    private CommunityCollectionMapper communityCollectionMapper;
 
     /**
      * 查询文章列表
@@ -176,6 +178,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
                     .and((wrapper) -> {
                         wrapper.ne("is_delete", true).or().isNull("is_delete");
                     })).size());
+            //设置文章所属合集
+            articleVo.setCollectionVo(communityCollectionMapper.selectCollectById(userId, articleVo.getId()));
 
             //文章下的评论
 //            List<Map<String, Object>> comments = articleVo.getComments();

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityArticleVo.java

@@ -123,4 +123,7 @@ public class CommunityArticleVo extends BaseEntity implements Serializable {
 
     @ApiModelProperty("文章标签")
     private List<CommunityTag> tags;
+
+    @ApiModelProperty("文章标签")
+    private CommunityCollectionVo collectionVo;
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityCollectionVo.java

@@ -68,32 +68,15 @@ public class CommunityCollectionVo implements Serializable {
      */
     @ApiModelProperty("文章数量")
     private Long articleCount;
-
-    /**
-     * 是否删除
-     */
-    @ApiModelProperty("是否删除")
-    private boolean isDelete;
     /**
     * 创建人
     */
     @ApiModelProperty("创建人")
     private Long createBy;
     /**
-    * 更新人
-    */
-    @ApiModelProperty("更新人")
-    private Long updateBy;
-    /**
     * 创建时间
     */
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    /**
-    * 更新时间
-    */
-    @ApiModelProperty("更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
 }

ruoyi-generator/src/main/resources/mapper/community/CommunityCollectionMapper.xml

@@ -35,4 +35,12 @@
         a.create_time,
         a.update_time;
     </select>
+
+
+    <select id="selectCollectById" resultType="com.ruoyi.generator.vo.CommunityCollectionVo">
+        select a.id,a.collection_name,a.collection_profile,a.images
+        from `ruoyi-community`.community_collection a
+                 left join `ruoyi-community`.community_collection_article b on a.id = b.collection_id
+        where b.article_id = #{articleId} and (b.is_delete is null or b.is_delete != '1')
+    </select>
 </mapper>