修复获取文章代码 , 新增收藏数量, 修改用户列表到主表上

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /home/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

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

@@ -120,6 +120,11 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
                                 .eq("article_id", articleVo.getId()))
                         .size());
 
+                articleVo.setCollectCount(communityCollectMapper
+                        .selectList(new QueryWrapper<CommunityArticleCollect>()
+                                .eq("article_id", articleVo.getId()))
+                        .size());
+
                 //文章下的评论
                 List<CommunityArticleCommentVo> comments = articleVo.getComments();
                 for (CommunityArticleCommentVo communityArticleCommentVo : comments) {

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

@@ -2,7 +2,6 @@ package com.ruoyi.generator.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.generator.domain.Community.CommunityArticleImages;
 import com.ruoyi.generator.domain.Community.CommunityTag;
 import io.swagger.annotations.ApiModel;
@@ -68,14 +67,29 @@ public class CommunityArticleVo extends BaseEntity implements Serializable {
     @ApiModelProperty("点赞个数")
     private int likeCount;
 
+    @ApiModelProperty("收藏个数")
+    private int collectCount;
+
     @ApiModelProperty("是否允许评论")
     private boolean isComment;
 
     @ApiModelProperty("是否已收藏")
     private boolean isCollect;
 
-    @ApiModelProperty("用户信息")
-    private List<SysUser> sysUsers;
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    @ApiModelProperty("昵称")
+    private String nickName;
+
+    @ApiModelProperty("邮箱地址")
+    private String email;
+
+    @ApiModelProperty("头像地址")
+    private String avatar;
+
+//    @ApiModelProperty("用户信息")
+//    private List<SysUser> sysUsers;
 
     @ApiModelProperty("文章图片集合")
     private List<CommunityArticleImages> imageList;

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

@@ -15,8 +15,11 @@
         <result property="updateBy" column="article_update_by"/>
         <result property="updateTime" column="article_update_time"/>
         <result property="remark" column="remark"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="email" column="email"/>
+        <result property="avatar" column="avatar"/>
         <collection property="imageList" javaType="java.util.List" resultMap="CommunityArticleImagesResult"/>
-        <collection property="sysUsers" resultMap="SysUserResult"/>
         <collection property="comments" resultMap="CommunityCommentsResult"/>
     </resultMap>
 
@@ -34,10 +37,10 @@
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
         <result property="phonenumber" column="phonenumber"/>
-        <result property="userName" column="user_name"/>
-        <result property="nickName" column="nick_name"/>
         <result property="sex" column="sex"/>
         <result property="password" column="password"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
         <result property="avatar" column="avatar"/>
         <result property="status" column="status"/>