修改代码结构

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -7,12 +7,15 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.Setter;
 
 /**
  * Entity基类
  * 
  * @author ruoyi
  */
+@Data
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
@@ -42,66 +45,6 @@ public class BaseEntity implements Serializable
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy()
-    {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy()
-    {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
     public Map<String, Object> getParams()
     {
         if (params == null)
@@ -111,8 +54,4 @@ public class BaseEntity implements Serializable
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
 }

ruoyi-generator/pom.xml

@@ -45,6 +45,14 @@
             <artifactId>swagger-models</artifactId>
             <version>1.6.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityArticle.java

@@ -48,10 +48,10 @@ public class CommunityArticle extends BaseEntity implements Serializable {
     */
     @ApiModelProperty("文章内容")
     private String content;
+
     /**
-    * 图片URL
-    */
-    @NotBlank(message="[图片ID]不能为空")
-    @ApiModelProperty("图片ID")
-    private String imageId;
+     * 文章内容
+     */
+    @ApiModelProperty("是否允许评价")
+    private String isComment;
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityArticleCollect.java

@@ -0,0 +1,42 @@
+package com.ruoyi.generator.domain.Community;
+
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+* 用户文章收藏表
+* @TableName community_article_collect
+*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommunityArticleCollect extends BaseEntity implements Serializable {
+
+    /**
+    * 收藏id
+    */
+    @NotNull(message="[收藏id]不能为空")
+    @ApiModelProperty("收藏id")
+    private Long collectId;
+    /**
+    * 文章id
+    */
+    @ApiModelProperty("文章id")
+    private Long articleId;
+    /**
+    * 用户id
+    */
+    @ApiModelProperty("用户id")
+    private Long userId;
+}

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityArticleComment.java

@@ -0,0 +1,46 @@
+package com.ruoyi.generator.domain.Community;
+
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+* 文章评价记录表
+* @TableName community_article_comment
+*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommunityArticleComment extends BaseEntity implements Serializable {
+
+    /**
+    * 评论id
+    */
+    @NotNull(message="[评论id]不能为空")
+    @ApiModelProperty("评论id")
+    private Long commentId;
+    /**
+    * 文章id
+    */
+    @ApiModelProperty("文章id")
+    private Long articleId;
+    /**
+    * 评论人id
+    */
+    @ApiModelProperty("评论人id")
+    private Long userId;
+
+    /**
+     * 评论内容
+     */
+    @ApiModelProperty("评论内容")
+    private String content;
+}

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityArticleImages.java

@@ -22,13 +22,13 @@ public class CommunityArticleImages extends BaseEntity implements Serializable {
      * 图片id
      */
     @ApiModelProperty("图片id")
-    private Integer imageId;
+    private Long imageId;
 
     /**
      * 文章id
      */
     @ApiModelProperty("文章id")
-    private Integer articleId;
+    private Long articleId;
 
     /**
      * 图片地址

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityLike.java

@@ -0,0 +1,40 @@
+package com.ruoyi.generator.domain.Community;
+
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+* 用户点赞文章记录
+* @TableName community_like
+*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommunityLike extends BaseEntity implements Serializable {
+
+    /**
+    * 唯一id
+    */
+    @NotNull(message="[唯一id]不能为空")
+    @ApiModelProperty("唯一id")
+    private Long likeId;
+    /**
+    * 文章id
+    */
+    @ApiModelProperty("文章id")
+    private Long articleId;
+    /**
+    * 用户id
+    */
+    @ApiModelProperty("用户id")
+    private Long userId;
+}

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityUser.java

@@ -1,52 +0,0 @@
-package com.ruoyi.generator.domain.Community;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 用户表
- * @TableName community_user
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class CommunityUser extends BaseEntity implements Serializable {
-    /**
-     * 用户id
-     */
-    @ApiModelProperty("用户id")
-    private Integer userId;
-
-    /**
-     * 用户名称
-     */
-    @ApiModelProperty("用户名称")
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    @ApiModelProperty("用户密码")
-    private String password;
-
-    /**
-     * 用户邮箱
-     */
-    @ApiModelProperty("用户邮箱")
-    private String email;
-
-    /**
-     * 头像地址
-     */
-    @ApiModelProperty("头像地址")
-    private String pictureUrl;
-
-    private static final long serialVersionUID = 1L;
-}

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

@@ -1,20 +1,45 @@
 package com.ruoyi.generator.mapper.community;
 
 import com.ruoyi.generator.domain.Community.CommunityArticle;
+import com.ruoyi.generator.domain.Community.CommunityArticleCollect;
+import com.ruoyi.generator.domain.Community.CommunityLike;
 import com.ruoyi.generator.vo.CommunityArticleVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 /**
-* @author Administrator
-* @description 针对表【community_user(用户表)】的数据库操作Mapper
-* @createDate 2024-08-24 15:35:46
-* @Entity com.ruoyi.generator.domain.Community.CommunityUser
-*/
+ * @author Administrator
+ * @description 针对表【community_user(用户表)】的数据库操作Mapper
+ * @createDate 2024-08-24 15:35:46
+ * @Entity com.ruoyi.generator.domain.Community.CommunityUser
+ */
 @Mapper
 public interface CommunityArticleMapper {
+    /**
+     * 获取文章内容首页信息
+     *
+     * @param communityArticle 文章条件
+     * @return 文章首页信息
+     */
     List<CommunityArticleVo> selectCommunityArticleList(CommunityArticle communityArticle);
+
+    /**
+     * 获取该用户是否收藏该文章
+     *
+     * @param userId    用户id
+     * @param articleId 文章id
+     * @return 文章收藏信息
+     */
+    CommunityArticleCollect selectCommunityArticleCollectById(Long userId, Long articleId);
+
+    /**
+     * 获取该用户是否已点赞该文章
+     * @param userId 用户id
+     * @param articleId 文章id
+     * @return 文章点赞信息
+     */
+    CommunityLike selectCommunityArticleLikeById(Long userId, Long articleId);
 }
 
 

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

@@ -1,15 +0,0 @@
-package com.ruoyi.generator.mapper.community;
-
-/**
-* @author Administrator
-* @description 针对表【community_user(用户表)】的数据库操作Mapper
-* @createDate 2024-08-24 15:35:46
-* @Entity com.ruoyi.generator.domain.Community.CommunityUser
-*/
-public interface CommunityUserMapper {
-
-}
-
-
-
-

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

@@ -1,28 +1,37 @@
 package com.ruoyi.generator.service;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.generator.domain.Community.CommunityArticle;
+import com.ruoyi.generator.domain.Community.CommunityArticleCollect;
+import com.ruoyi.generator.domain.Community.CommunityLike;
 import com.ruoyi.generator.mapper.community.CommunityArticleMapper;
+import com.ruoyi.generator.vo.CommunityArticleCommentVo;
 import com.ruoyi.generator.vo.CommunityArticleVo;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 业务 服务层实现
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class CommunityArticleServiceImpl implements ICommunityArticleService
-{
+public class CommunityArticleServiceImpl implements ICommunityArticleService {
     private static final Logger log = LoggerFactory.getLogger(CommunityArticleServiceImpl.class);
 
     @Autowired
     private CommunityArticleMapper communityArticleMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询文章列表
      *
@@ -31,6 +40,27 @@ public class CommunityArticleServiceImpl implements ICommunityArticleService
      */
     @Override
     public List<CommunityArticleVo> selectCommunityArticleList(CommunityArticle communityArticle) {
-        return communityArticleMapper.selectCommunityArticleList(communityArticle);
+        List<CommunityArticleVo> communityArticleVos = communityArticleMapper.selectCommunityArticleList(communityArticle);
+        CommunityArticleVo communityArticleVo = null;
+        for (int i = 0; i < communityArticleVos.size(); i++) {
+            communityArticleVo = communityArticleVos.get(i);
+            //文章下的评论
+            List<CommunityArticleCommentVo> comments = communityArticleVo.getComments();
+            for (CommunityArticleCommentVo communityArticleCommentVo : comments) {
+                //获取评论的用户信息
+                SysUser sysUser = sysUserMapper.selectUserById(communityArticleCommentVo.getUserId());
+                communityArticleCommentVo.setUsername(sysUser.getUserName());
+                communityArticleCommentVo.setAvatar(sysUser.getAvatar());
+
+                //判断是否已收藏
+                CommunityArticleCollect collect = communityArticleMapper.selectCommunityArticleCollectById(SecurityUtils.getUserId(), communityArticleCommentVo.getArticleId());
+                communityArticleVo.setCollect(!Objects.isNull(collect));
+
+                //判断是否已点赞
+                CommunityLike like = communityArticleMapper.selectCommunityArticleLikeById(SecurityUtils.getUserId(), communityArticleCommentVo.getArticleId());
+                communityArticleVo.setLike(!Objects.isNull(like));
+            }
+        }
+        return communityArticleVos;
     }
 }

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

@@ -0,0 +1,57 @@
+package com.ruoyi.generator.vo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+* 文章评价记录表
+* @TableName community_article_comment
+*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommunityArticleCommentVo extends BaseEntity implements Serializable {
+
+    /**
+    * 评论id
+    */
+    @NotNull(message="[评论id]不能为空")
+    @ApiModelProperty("评论id")
+    private Long commentId;
+    /**
+    * 文章id
+    */
+    @ApiModelProperty("文章id")
+    private Long articleId;
+    /**
+    * 评论人id
+    */
+    @ApiModelProperty("评论人id")
+    private Long userId;
+
+    /**
+     * 评论人用户名
+     */
+    @ApiModelProperty("评论人用户名")
+    private String username;
+
+    /**
+     * 评论人头像
+     */
+    @ApiModelProperty("评论人头像")
+    private String avatar;
+
+    /**
+     * 评论内容
+     */
+    @ApiModelProperty("评论内容")
+    private String content;
+}

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

@@ -1,8 +1,8 @@
 package com.ruoyi.generator.vo;
 
 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.CommunityUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -39,7 +39,7 @@ public class CommunityArticleVo extends BaseEntity implements Serializable {
     */
     @NotNull(message="[创建人id]不能为空")
     @ApiModelProperty("创建人id")
-    private Integer userId;
+    private Long userId;
     /**
     * 文章标题
     */
@@ -53,17 +53,22 @@ public class CommunityArticleVo extends BaseEntity implements Serializable {
     */
     @ApiModelProperty("文章内容")
     private String content;
-    /**
-    * 图片URL
-    */
-    @NotBlank(message="[图片ID]不能为空")
-    @ApiModelProperty("图片ID")
-    private String imageId;
+
+    @ApiModelProperty("是否已点赞")
+    private boolean isLike;
+
+    @ApiModelProperty("是否允许评论")
+    private boolean isComment;
+
+    @ApiModelProperty("是否已收藏")
+    private boolean isCollect;
+
+    @ApiModelProperty("用户信息")
+    private List<SysUser> sysUsers;
 
     @ApiModelProperty("文章图片集合")
     private List<CommunityArticleImages> imageList;
 
-    @ApiModelProperty("文章所属用户信息")
-    private CommunityUser communityUser;
-
+    @ApiModelProperty("文章评论信息")
+    private List<CommunityArticleCommentVo> comments;
 }

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

@@ -9,14 +9,14 @@
         <result property="userId" column="user_id"/>
         <result property="title" column="title"/>
         <result property="content" column="content"/>
-        <result property="imageId" column="image_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <collection property="imageList" javaType="java.util.List" resultMap="CommunityArticleImagesResult"/>
-        <collection property="communityUser" resultMap="CommunityUserResult"/>
+        <collection property="sysUsers" resultMap="SysUserResult"/>
+        <collection property="comments" resultMap="CommunityCommentsResult"/>
     </resultMap>
 
     <resultMap type="CommunityArticleImages" id="CommunityArticleImagesResult">
@@ -30,12 +30,17 @@
         <result property="remark" column="remark"/>
     </resultMap>
 
-    <resultMap type="CommunityUser" id="CommunityUserResult">
+    <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
-        <result property="username" column="username"/>
+        <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="email" column="email"/>
-        <result property="pictureUrl" column="picture_url"/>
+        <result property="avatar" column="avatar"/>
+        <result property="status" column="status"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -43,12 +48,43 @@
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.generator.vo.CommunityArticleCommentVo" id="CommunityCommentsResult">
+        <id property="commentId" column="comment_id"/>
+        <result property="articleId" column="article_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="content" column="comment_content"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <resultMap id="CommunityCollectResult" type="CommunityArticleCollect">
+        <id property="collectId" column="collect_id"/>
+        <result property="articleId" column="article_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap id="CommunityLikeResult" type="CommunityLike">
+        <id property="likeId" column="like_id"/>
+        <result property="articleId" column="article_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
     <sql id="selectCommunityArticleVo">
         select article_id,
                user_id,
                title,
                content,
-               image_id,
                create_by,
                create_time,
                update_by,
@@ -58,11 +94,12 @@
     </sql>
 
     <select id="selectCommunityArticleList" parameterType="CommunityArticle" resultMap="CommunityArticleVoResult">
-        select a.article_id,
+        select
+        a.article_id,
         a.user_id,
         a.title,
+        a.is_comment,
         a.content,
-        a.image_id,
         a.create_by,
         a.create_time,
         a.update_by,
@@ -76,15 +113,52 @@
         b.update_by,
         b.update_time,
         b.remark,
-        c.username,
+        c.user_name,
+        c.nick_name,
         c.email,
-        c.picture_url from
+        c.avatar,
+        d.comment_id,
+        d.article_id,
+        d.user_id,
+        d.content as comment_content,
+        d.create_by,
+        d.create_time,
+        d.update_by,
+        d.update_time
+        from
         community_article a
         left join community_article_images b on a.article_id = b.article_id
-        left join community_user c on a.user_id = c.user_id
+        left join sys_user c on a.user_id = c.user_id
+        left join community_article_comment d on d.article_id = a.article_id
         <where>
             <if test="title != null and title != ''">
-                AND title like concat('%', #{title}, '%')
+                AND a.title like concat('%', #{title}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCommunityArticleCollectById" resultMap="CommunityCollectResult">
+        select collect_id, article_id, user_id, create_by, create_time, update_by, update_time from
+        community_article_collect
+        <where>
+            <if test="user_id != null and user_id != '">
+                user_id = #{userId}
+            </if>
+            <if test="article_id != null and article_id != '">
+                and article_id = #{articleId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCommunityArticleLikeById" resultMap="CommunityLikeResult">
+        select like_id, article_id, user_id, create_by, create_time, update_by, update_time from
+        community_like
+        <where>
+            <if test="user_id != null and user_id != '">
+                user_id = #{userId}
+            </if>
+            <if test="article_id != null and article_id != '">
+                and article_id = #{articleId}
             </if>
         </where>
     </select>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.generator.mapper.community.CommunityUserMapper">
-
-    <resultMap id="BaseResultMap" type="com.ruoyi.generator.domain.Community.CommunityUser">
-            <id property="userId" column="user_id" jdbcType="INTEGER"/>
-            <result property="username" column="username" jdbcType="VARCHAR"/>
-            <result property="password" column="password" jdbcType="VARCHAR"/>
-            <result property="email" column="email" jdbcType="VARCHAR"/>
-            <result property="pictureUrl" column="picture_url" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        user_id,username,password,
-        email,picture_url
-    </sql>
-</mapper>