Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/community-center

# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java

@@ -2,25 +2,61 @@ package com.mcwl.web.controller.communityCenter;
 
 
 import com.mcwl.communityCenter.domain.Community;
-import com.mcwl.communityCenter.service.CommunityCenterService;
+import com.mcwl.communityCenter.service.CommunityService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+/**
+ * 社区
+ */
 @RestController
 @RequestMapping("community")
 @RequiredArgsConstructor
 public class CommunityController {
 
-    private final CommunityCenterService communityCenterService;
+    private final CommunityService communityService;
 
 
+    /**
+     * 社区列表
+     * @return 社区列表
+     */
     @GetMapping("list")
     public List<Community> getCommunityList(){
-        return communityCenterService.list();
+        return communityService.list();
+    }
+
+
+    /**
+     * 添加社区
+     * @param community 社区
+     * @return 添加结果
+     */
+    @PostMapping("add")
+    public boolean addCommunity(@RequestBody Community community){
+        return communityService.save(community);
+    }
+
+    /**
+     * 删除社区
+     * @param id 社区id
+     * @return 删除结果
+     */
+    @PostMapping("delete")
+    public boolean deleteCommunity(Long id){
+        return communityService.removeById(id);
+    }
+
+    /**
+     * 修改社区
+     * @param community 社区
+     * @return 修改结果
+     */
+    @PostMapping("update")
+    public boolean updateCommunity(@RequestBody Community community){
+        return communityService.updateById(community);
     }
 
 }

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/InviteController.java

@@ -0,0 +1,33 @@
+package com.mcwl.web.controller.communityCenter;
+
+
+import com.mcwl.common.core.domain.AjaxResult;
+import com.mcwl.communityCenter.service.InviteMappingService;
+import com.mcwl.communityCenter.service.InviteService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 邀请
+ */
+@RestController
+@RequestMapping("invite")
+@RequiredArgsConstructor
+public class InviteController {
+
+    private final InviteService inviteService;
+
+    /**
+     * 邀请码链接
+     */
+    @GetMapping("inviteCode")
+    public AjaxResult inviteCode(){
+        // 获取邀请码链接
+        String inviteCode = inviteService.getInviteCode();
+        return AjaxResult.success(inviteCode);
+    }
+
+
+}

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

@@ -2,14 +2,17 @@ package com.mcwl.web.controller.communityCenter;
 
 
 import com.mcwl.communityCenter.domain.Publish;
+import com.mcwl.communityCenter.domain.dto.PublishRes;
+import com.mcwl.communityCenter.domain.vo.PublishVo;
 import com.mcwl.communityCenter.service.PublishService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import java.util.Objects;
 
+/**
+ * 发布
+ */
 @RestController
 @RequestMapping("publish")
 @RequiredArgsConstructor
@@ -18,9 +21,45 @@ public class PublishController {
     private final PublishService publishService;
 
 
-    @GetMapping("list")
+    /**
-    public List<Publish> getCommunityList(){
+     * 获取发布列表
-        return publishService.list();
+     *
+     * @return
+     */
+    @PostMapping("list")
+    public TableDataInfo getCommunityList(@RequestBody PageDomain pageDomain) {
+        return publishService.listByPage(pageDomain);
+    }
+
+    /**
+     * 获取发布详情
+     */
+    @GetMapping("detail")
+    public AjaxResult getPublishDetail(Long id) {
+
+        PublishVo publishVo = publishService.getDetail(id);
+        if (Objects.isNull(publishVo)) {
+            return AjaxResult.error("获取详情失败");
+        }
+        return AjaxResult.success(publishVo);
+    }
+
+    /**
+     * 添加
+     */
+    @PostMapping("add")
+    public AjaxResult addPublish(@RequestBody PublishRes publishRes) {
+        Publish publish = new Publish();
+        BeanUtil.copyProperties(publishRes, publish);
+        return AjaxResult.success(publishService.save(publish));
+    }
+
+    /**
+     * 删除
+     */
+    @GetMapping("remove")
+    public AjaxResult deletePublish(Long id) {
+        return AjaxResult.success(publishService.removeById(id));
     }
 
 

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java

@@ -0,0 +1,19 @@
+package com.mcwl.web.controller.communityCenter;
+
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 提问
+ */
+@RestController
+@RequestMapping("question")
+@RequiredArgsConstructor
+public class QuestionController {
+
+
+
+
+}

mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java

@@ -152,5 +152,17 @@ public class MemberController {
         return AjaxResult.success(unitPrice);
     }
 
+    /**
+     * 是否是会员
+     */
+    @GetMapping("isMember")
+    public AjaxResult isMember() {
+        Long userId = SecurityUtils.getUserId();
+        Member member = memberService.getUseUserMemberByUserId(userId);
+        if (Optional.ofNullable(member).isPresent()) {
+            return AjaxResult.success(true);
+        }
+        return AjaxResult.success(false);
+    }
 
 }

mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysUserController.java

@@ -47,6 +47,15 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    /**
+     * 获取id
+     */
+    @GetMapping("/getUserId")
+    public AjaxResult getSysUserId() {
+        Long userId = SecurityUtils.getUserId();
+        return AjaxResult.success(userId);
+    }
+
     /**
      * 获取用户列表
      */

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -28,17 +29,21 @@ public class BaseEntity implements Serializable
     private String searchValue;
 
     /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 更新者 */
+    @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     // 删除标志（0代表存在 2代表删除）

mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java

@@ -0,0 +1,33 @@
+package com.mcwl.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mcwl.common.utils.SecurityUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+/**
+ * mybatis-plus 自动填充处理器
+ */
+
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("tenantId", SecurityUtils.getUserId(), metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Community.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 社区信息
+ * 社区
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Invite.java

@@ -0,0 +1,34 @@
+package com.mcwl.communityCenter.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mcwl.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 邀请表
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("cc_invite")
+public class Invite extends BaseEntity {
+
+    @TableId
+    private Long id;
+    /**
+     * 用户id - 租户id
+     */
+    private Long tenantId;
+    /**
+     * 被邀请人
+     */
+    private Long inviteeUserId;
+    /**
+     * 受邀类型
+     */
+    private String type;
+
+
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/InviteMapping.java

@@ -0,0 +1,34 @@
+package com.mcwl.communityCenter.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mcwl.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 邀请映射
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("cc_invite_mapping")
+public class InviteMapping extends BaseEntity {
+
+    @TableId
+    private String id;
+    /**
+     * 用户id - 租户id
+     */
+    private String tenantId;
+    /**
+     * 邀请链接
+     */
+    private String inviteUrl;
+    /**
+     * 状态
+     */
+    private String status;
+
+
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java

@@ -1,6 +1,8 @@
 package com.mcwl.communityCenter.domain;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mcwl.common.core.domain.BaseEntity;
@@ -24,6 +26,7 @@ public class Publish extends BaseEntity {
     /**
      * 用户id - 租户id
      */
+    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
@@ -36,6 +39,16 @@ public class Publish extends BaseEntity {
      */
     private Date publishTime;
 
+    /**
+     * 点赞数
+     */
+    private Integer likeNum;
+
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+
     /**
      * 状态
      */

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java

@@ -1,6 +1,8 @@
 package com.mcwl.communityCenter.domain;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mcwl.common.core.domain.BaseEntity;
@@ -22,6 +24,7 @@ public class Question extends BaseEntity {
     /**
      * 用户id - 租户id
      */
+    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
@@ -34,6 +37,11 @@ public class Question extends BaseEntity {
      */
     private String content;
 
+    /**
+     * 答复用户id
+     */
+    private Long replyUserId;
+
     /**
      * 回复内容
      */

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/UserCommunity.java

@@ -1,6 +1,8 @@
 package com.mcwl.communityCenter.domain;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mcwl.common.core.domain.BaseEntity;
@@ -22,6 +24,7 @@ public class UserCommunity extends BaseEntity {
     /**
      * 用户id - 多租户id
      */
+    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java

@@ -0,0 +1,28 @@
+package com.mcwl.communityCenter.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 发布请求参数
+ */
+@Data
+public class PublishRes {
+    /**
+     * 内容
+     */
+    @NotBlank(message = "内容不能为空")
+    private String content;
+
+    /**
+     * 发布时间 - 定时发布
+     */
+    private Date publishTime;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java

@@ -0,0 +1,50 @@
+package com.mcwl.communityCenter.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PublishVo {
+
+    private Long id;
+
+    /**
+     * 用户id - 租户id
+     */
+    private Long tenantId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 发布时间 - 定时发布
+     */
+    private Date publishTime;
+
+    /**
+     * 点赞数
+     */
+    private Integer likeNum;
+
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+
+
+
+
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/InviteMapper.java

@@ -0,0 +1,11 @@
+package com.mcwl.communityCenter.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mcwl.communityCenter.domain.Community;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.InviteMapping;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InviteMapper extends BaseMapper<Invite> {
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/InviteMappingMapper.java

@@ -0,0 +1,10 @@
+package com.mcwl.communityCenter.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.InviteMapping;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InviteMappingMapper extends BaseMapper<InviteMapping> {
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java

@@ -3,5 +3,5 @@ package com.mcwl.communityCenter.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mcwl.communityCenter.domain.Community;
 
-public interface CommunityCenterService extends IService<Community> {
+public interface CommunityService extends IService<Community> {
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/InviteMappingService.java

@@ -0,0 +1,9 @@
+package com.mcwl.communityCenter.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.InviteMapping;
+
+public interface InviteMappingService extends IService<InviteMapping> {
+    String getInviteCode();
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/InviteService.java

@@ -0,0 +1,12 @@
+package com.mcwl.communityCenter.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.Publish;
+import com.mcwl.communityCenter.domain.vo.PublishVo;
+
+public interface InviteService extends IService<Invite> {
+    String getInviteCode();
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java

@@ -1,8 +1,14 @@
 package com.mcwl.communityCenter.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.communityCenter.domain.Community;
 import com.mcwl.communityCenter.domain.Publish;
+import com.mcwl.communityCenter.domain.vo.PublishVo;
 
 public interface PublishService extends IService<Publish> {
+    TableDataInfo listByPage(PageDomain pageDomain);
+
+    PublishVo getDetail(Long id);
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java

@@ -3,9 +3,9 @@ package com.mcwl.communityCenter.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mcwl.communityCenter.domain.Community;
 import com.mcwl.communityCenter.mapper.CommunityMapper;
-import com.mcwl.communityCenter.service.CommunityCenterService;
+import com.mcwl.communityCenter.service.CommunityService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class CommunityCenterServiceImpl extends ServiceImpl<CommunityMapper, Community> implements CommunityCenterService {
+public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community> implements CommunityService {
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteMappingServiceImpl.java

@@ -0,0 +1,25 @@
+package com.mcwl.communityCenter.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.InviteMapping;
+import com.mcwl.communityCenter.mapper.InviteMapper;
+import com.mcwl.communityCenter.mapper.InviteMappingMapper;
+import com.mcwl.communityCenter.service.InviteMappingService;
+import com.mcwl.communityCenter.service.InviteService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InviteMappingServiceImpl extends ServiceImpl<InviteMappingMapper, InviteMapping> implements InviteMappingService {
+
+    @Override
+    public String getInviteCode() {
+
+
+
+
+        return "https://aaa.com";
+    }
+
+
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java

@@ -0,0 +1,32 @@
+package com.mcwl.communityCenter.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.common.constant.HttpStatus;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.common.utils.SecurityUtils;
+import com.mcwl.communityCenter.domain.Invite;
+import com.mcwl.communityCenter.domain.Publish;
+import com.mcwl.communityCenter.domain.vo.PublishVo;
+import com.mcwl.communityCenter.mapper.InviteMapper;
+import com.mcwl.communityCenter.mapper.PublishMapper;
+import com.mcwl.communityCenter.service.InviteService;
+import com.mcwl.communityCenter.service.PublishService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class InviteServiceImpl extends ServiceImpl<InviteMapper, Invite> implements InviteService {
+    @Override
+    public String getInviteCode() {
+        String url = "https://www.yaoqing.com?name=lisi";
+        return url;
+    }
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java

@@ -1,11 +1,79 @@
 package com.mcwl.communityCenter.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.mcwl.common.constant.HttpStatus;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.common.utils.SecurityUtils;
 import com.mcwl.communityCenter.domain.Publish;
+import com.mcwl.communityCenter.domain.vo.PublishVo;
 import com.mcwl.communityCenter.mapper.PublishMapper;
 import com.mcwl.communityCenter.service.PublishService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 @Service
 public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> implements PublishService {
+    @Override
+    public TableDataInfo listByPage(PageDomain pageDomain) {
+        // 分页查询
+        Page<Publish> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        boolean isAsc = Objects.equals(pageDomain.getIsAsc(), "asc");
+        OrderItem orderItem = new OrderItem(pageDomain.getOrderByColumn(), isAsc);
+        page.addOrder(orderItem);
+
+        // 条件设置
+        LambdaQueryWrapper<Publish> lqw = new LambdaQueryWrapper<>();
+
+        // 查询
+        baseMapper.selectPage(page, lqw);
+
+        // 返回数据
+        List<PublishVo> publishVoList = new ArrayList<>();
+
+        // 封装数据
+        List<Publish> publishList = page.getRecords();
+        for (Publish publish : publishList) {
+            PublishVo publishVo = new PublishVo();
+            BeanUtil.copyProperties(publish, publishVo);
+            publishVo.setUserName(SecurityUtils.getUsername());
+            publishVo.setAvatar(SecurityUtils.getLoginUser().getUser().getAvatar());
+            // TODO 评论数
+            publishVo.setCommentNum(0);
+            publishVoList.add(publishVo);
+
+        }
+
+
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(publishVoList);
+        rspData.setTotal(page.getTotal());
+
+        return rspData;
+    }
+
+    @Override
+    public PublishVo getDetail(Long id) {
+
+        Publish publish = baseMapper.selectById(id);
+        if (Objects.isNull(publish)) {
+            return null;
+        }
+        PublishVo publishVo = new PublishVo();
+        BeanUtil.copyProperties(publish, publishVo);
+        publishVo.setUserName(SecurityUtils.getUsername());
+        publishVo.setAvatar(SecurityUtils.getLoginUser().getUser().getAvatar());
+        return publishVo;
+    }
 }