huanghongfa
2021-04-28 08f5812ad5403b4ebddff875cf6e1fa260934129
bug修复
8个文件已修改
4个文件已添加
139 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseDAO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseDO.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -29,9 +29,9 @@
    private CommunityService communityService;
    @ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
    @PostMapping("page")
    @PostMapping("pageApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return communityService.pageNeighbor(neighborCircleAppDTO);
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -39,6 +39,9 @@
    @ApiModelProperty("转发数")
    private Integer forwardNum;
    @ApiModelProperty("浏览量")
    private Integer viewsNum;
    @ApiModelProperty("是否为精品帖(1.是 2.否)")
    private Integer isBoutique;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2244,7 +2244,7 @@
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighbor")
    R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -21,9 +21,9 @@
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("pageNeighbor")
    @PostMapping("pageNeighborByApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleService.pageNeighbor(neighborCircleAppDTO);
        return comActNeighborCircleService.pageNeighborByApp(neighborCircleAppDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseDAO.java
New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseDO;
import org.apache.ibatis.annotations.Mapper;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表mapper类
 */
@Mapper
public interface ComActNeighborCircleBrowseDAO extends BaseMapper<ComActNeighborCircleBrowseDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -20,6 +20,6 @@
public interface ComActNeighborCircleDAO extends BaseMapper<ComActNeighborCircleDO> {
    @Select("")
    IPage<ComActNeighborCircleAppVO> pageNeighbor(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
    IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseDO.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表实体类
 */
@Data
@TableName("com_act_neighbor_circle_browse")
public class ComActNeighborCircleBrowseDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 邻里圈id
     */
    private Long neighborId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 浏览时间
     */
    private Date createAt;
    @Override
    public String toString() {
        return "ComActNeighborCircleBrowseDO{" +
                "id=" + id +
                ", neighborId=" + neighborId +
                ", userId=" + userId +
                ", createAt=" + createAt +
                "}";
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -97,6 +97,21 @@
     */
    private Date replyAt;
    /**
     * 评论数
     */
    private Integer lastCommentNum;
    /**
     * 点赞数
     */
    private Integer lastFabulousNum;
    /**
     * 浏览量
     */
    private Integer lastViewsNum;
    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseService.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseDO;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表服务类
 */
public interface ComActNeighborCircleBrowseService extends IService<ComActNeighborCircleBrowseDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -17,6 +17,6 @@
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    R pageNeighbor(ComActNeighborCircleAppDTO neighborCircleAppDTO);
    R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseServiceImpl.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActNeighborCircleBrowseDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseDO;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleBrowseServiceImpl extends ServiceImpl<ComActNeighborCircleBrowseDAO, ComActNeighborCircleBrowseDO> implements ComActNeighborCircleBrowseService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -26,9 +26,9 @@
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    public R pageNeighbor(ComActNeighborCircleAppDTO neighborCircleAppDTO){
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighbor(userPage, neighborCircleAppDTO);
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        return R.ok(doPager);
    }