Merge branch 'test' into 'master'

罗yu 元桥

2021-04-28 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!3

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:49
 * @describe 邻里圈模块API
 */
@Slf4j
@RestController
@RequestMapping("/neighbor/")
@Api(tags = {"邻里圈服务"})
public class NeighborApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
    @PostMapping("pageApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
    }



}


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java

@@ -2,22 +2,17 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * @description: 办事指南管理
@@ -33,7 +28,7 @@

    @ApiOperation(value = "办事指南_新增")
    @PostMapping("addworkguide")
    public R addStreet(@RequestBody ComActWorkGuideVO workGuideVO) {
    public R addStreet(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        return communityService.addWorkGuide(workGuideVO,loginUserInfo.getUserId());
    }
@@ -41,7 +36,7 @@

    @PostMapping("editworkguide")
    @ApiOperation(value = "办事指南_编辑")
    public R putWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO) {
    public R putWorkGuide(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        return communityService.editWorkGuide(workGuideVO,loginUserInfo.getUserId());
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.dtos.neighbor;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther llming
 * @describe 邻里圈请求参数
 */
@Data
@ApiModel("邻里圈请求参数")
public class ComActNeighborCircleAdminDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
    private Integer type = 1;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.dtos.neighbor;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:14
 * @describe 邻里圈请求参数
 */
@Data
@ApiModel("邻里圈请求参数")
public class ComActNeighborCircleAppDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
    private Integer type = 1;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java

@@ -1,13 +1,13 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.collect.Lists;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.hibernate.validator.constraints.Length;

import java.util.Date;
import javax.validation.constraints.NotNull;
import java.util.List;

/**
@@ -21,9 +21,13 @@
    private Long id;

    @ApiModelProperty("办事指南标题")
    @NotNull(groups = {AddGroup.class}, message = "标题不能为空")
    @Length(groups = {AddGroup.class}, max = 35)
    private String title;

    @ApiModelProperty("办事指南内容")
    @NotNull(groups = {AddGroup.class}, message = "内容不能为空")
    @Length(groups = {AddGroup.class}, max = 500)
    private String content;

    @ApiModelProperty("办理时间")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

New file
@@ -0,0 +1,54 @@
package com.panzhihua.common.model.vos.neighbor;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:14
 * @describe 邻里圈VO
 */
@Data
@ApiModel("邻里圈")
public class ComActNeighborCircleAppVO {

    @ApiModelProperty("邻里圈id")
    private Long id;

    @ApiModelProperty("邻里圈发布人名字")
    private String name;

    @ApiModelProperty("邻里圈发布人头像url地址")
    private String headUrl;

    @ApiModelProperty("发布内容")
    private String releaseContent;

    @ApiModelProperty("发布图片")
    private String releaseImages;

    @ApiModelProperty("评论数")
    private Integer commentNum;

    @ApiModelProperty("点赞数")
    private Integer fabulousNum;

    @ApiModelProperty("转发数")
    private Integer forwardNum;

    @ApiModelProperty("浏览量")
    private Integer viewsNum;

    @ApiModelProperty("是否为精品帖(1.是 2.否)")
    private Integer isBoutique;

    @ApiModelProperty("发布时间")
    private Date createAt;

    @ApiModelProperty("最后回复时间")
    private Date replyAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -2238,4 +2239,12 @@
    @PostMapping("/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

    /**
     * 分页查询邻里圈
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java

@@ -37,7 +37,7 @@
        log.info("请求公安实名认证接口，请求地址：" + URL);
        log.info("请求公安实名认证接口，请求参数：" + param);
        log.info("请求公安实名认证接口，请求头参数：" + headervalue + encodeToString);
        String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, "Basic MjA5MjI2MTkzNDY1MTkzMjY3MjpkZTFjMGRiYi05MTk3LTQ3MjQtOWNjMi1hYTk0ZTMwYTA3MmY6MTYxOTQyMTMyMzgxMg==");
        String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, headervalue + encodeToString);
        log.info("请求公安实名认证接口，返回参数：" + postByJson);
        int code = JSONObject.parseObject(postByJson).getIntValue("code");
        if (0==code) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@RestController
@RequestMapping("/neighbor")
public class NeighborApi {

    private ComActNeighborCircleService comActNeighborCircleService;

    /**
     * 分页查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("pageNeighborByApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleService.pageNeighborByApp(neighborCircleAppDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java

@@ -42,8 +42,9 @@
    
    @Select("<script> " +
            "SELECT * \n" +
            "FROM\n" +
            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
            "FROM \n" +
            " com_act_message t " +
            " where t.community_id=#{comActMessageVO.communityId}\n" +
            "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>" +
            " and t.user_account=#{comActMessageVO.userAccount} \n" +
            " </if> " +

 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/ComActNeighborCircleCommentDAO.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.ComActNeighborCircleCommentDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表mapper类
 */
@Mapper
public interface ComActNeighborCircleCommentDAO extends BaseMapper<ComActNeighborCircleCommentDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.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.ComActNeighborCircleCommentReplyDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表mapper类
 */
@Mapper
public interface ComActNeighborCircleCommentReplyDAO extends BaseMapper<ComActNeighborCircleCommentReplyDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表mapper类
 */
@Mapper
public interface ComActNeighborCircleDAO extends BaseMapper<ComActNeighborCircleDO> {

    @Select("")
    IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleFabulousDAO.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.ComActNeighborCircleFabulousDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表mapper类
 */
@Mapper
public interface ComActNeighborCircleFabulousDAO extends BaseMapper<ComActNeighborCircleFabulousDO> {

}

 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/ComActNeighborCircleCommentDO.java

New file
@@ -0,0 +1,84 @@
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 09:21:33
 * @describe 邻里圈评论表实体类
 */

@Data
@TableName("com_act_neighbor_circle_comment")
public class ComActNeighborCircleCommentDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 邻里圈id
     */
    private Long circleId;

    /**
     * 评论用户id
     */
    private Long userId;

    /**
     * 评论内容
     */
    private String content;

    /**
     * 评论用户手机号
     */
    private String userPhone;

    /**
     * 点赞数
     */
    private Integer fabulousNum;

    /**
     * 状态（1.显示 2.隐藏）
     */
    private Integer status;

    /**
     * 评论时间
     */
    private Date createAt;

    /**
     * 是否是作者评论（1.是 2.否）
     */
    private Integer isRelease;

    @Override
    public String toString() {
        return "ComActNeighborCircleCommentDO{" +
                "id=" + id +
                ", circleId=" + circleId +
                ", userId=" + userId +
                ", content=" + content +
                ", userPhone=" + userPhone +
                ", fabulousNum=" + fabulousNum +
                ", status=" + status +
                ", createAt=" + createAt +
                ", isRelease=" + isRelease +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java

New file
@@ -0,0 +1,90 @@
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 09:21:45
 * @describe 邻里圈评论回复表实体类
 */

@Data
@TableName("com_act_neighbor_circle_comment_reply")
public class ComActNeighborCircleCommentReplyDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 邻里圈id
     */
    private Long circleId;

    /**
     * 评论id
     */
    private Long commentId;

    /**
     * 上级回复id
     */
    private Long panentId;

    /**
     * 上级回复用户id
     */
    private Long parentUserId;

    /**
     * 回复用户id
     */
    private Long userId;

    /**
     * 回复内容
     */
    private String replyContent;

    /**
     * 点赞数
     */
    private Integer fabulousNum;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 是否是作者回复（1.是 2.否）
     */
    private Integer isRelease;

    @Override
    public String toString() {
        return "ComActNeighborCircleCommentReplyDO{" +
                "id=" + id +
                ", circleId=" + circleId +
                ", commentId=" + commentId +
                ", panentId=" + panentId +
                ", parentUserId=" + parentUserId +
                ", userId=" + userId +
                ", replyContent=" + replyContent +
                ", fabulousNum=" + fabulousNum +
                ", createAt=" + createAt +
                ", isRelease=" + isRelease +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java

New file
@@ -0,0 +1,133 @@
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 09:20:49
 * @describe 邻里圈表实体类
 */

@Data
@TableName("com_act_neighbor_circle")
public class ComActNeighborCircleDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 发布人id
     */
    private Long releaseId;

    /**
     * 发布人电话
     */
    private String releasePhone;

    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 发布内容
     */
    private String releaseContent;

    /**
     * 发布图片
     */
    private String releaseImages;

    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    private Integer status;

    /**
     * 驳回原因
     */
    private String refuseReason;

    /**
     * 评论数
     */
    private Integer commentNum;

    /**
     * 点赞数
     */
    private Integer fabulousNum;

    /**
     * 转发数
     */
    private Integer forwardNum;

    /**
     * 浏览量
     */
    private Integer viewsNum;

    /**
     * 是否为精品帖(1.是 2.否)
     */
    private Integer isBoutique;

    /**
     * 发布时间
     */
    private Date createAt;

    /**
     * 最后回复时间
     */
    private Date replyAt;

    /**
     * 评论数
     */
    private Integer lastCommentNum;

    /**
     * 点赞数
     */
    private Integer lastFabulousNum;

    /**
     * 浏览量
     */
    private Integer lastViewsNum;

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" +
                "id=" + id +
                ", releaseId=" + releaseId +
                ", releasePhone=" + releasePhone +
                ", communityId=" + communityId +
                ", releaseContent=" + releaseContent +
                ", releaseImages=" + releaseImages +
                ", status=" + status +
                ", refuseReason=" + refuseReason +
                ", commentNum=" + commentNum +
                ", fabulousNum=" + fabulousNum +
                ", forwardNum=" + forwardNum +
                ", isBoutique=" + isBoutique +
                ", createAt=" + createAt +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java

New file
@@ -0,0 +1,72 @@
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 09:21:55
 * @describe 邻里圈点赞表实体类
 */

@Data
@TableName("com_act_neighbor_circle_fabulous")
public class ComActNeighborCircleFabulousDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 点赞类型（1.邻里圈 2.评论 3.回复）
     */
    private Integer type;

    /**
     * 点赞上级id
     */
    private Long parentId;

    /**
     * 点赞用户id
     */
    private Long userId;

    /**
     * 有效状态（1.有效  2.取消）
     */
    private Integer isEffective;

    /**
     * 点赞时间
     */
    private Date createAt;

    /**
     * 修改时间
     */
    private Date updateAt;

    @Override
    public String toString() {
        return "ComActNeighborCircleFabulousDO{" +
                "id=" + id +
                ", type=" + type +
                ", parentId=" + parentId +
                ", userId=" + userId +
                ", isEffective=" + isEffective +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}

 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/ComActNeighborCircleCommentReplyService.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.ComActNeighborCircleCommentReplyDO;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表服务类
 */
public interface ComActNeighborCircleCommentReplyService extends IService<ComActNeighborCircleCommentReplyDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentService.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.ComActNeighborCircleCommentDO;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表服务类
 */
public interface ComActNeighborCircleCommentService extends IService<ComActNeighborCircleCommentDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleFabulousService.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.ComActNeighborCircleFabulousDO;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表服务类
 */
public interface ComActNeighborCircleFabulousService extends IService<ComActNeighborCircleFabulousDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;

/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表服务类
 */
public interface ComActNeighborCircleService extends IService<ComActNeighborCircleDO> {

    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO 请求参数
     * @return 邻里圈列表
     */
    R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @return
     */
    //R backstagePageNeighbor(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

}

 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/ComActNeighborCircleCommentReplyServiceImpl.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.ComActNeighborCircleCommentReplyDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import com.panzhihua.service_community.service.ComActNeighborCircleCommentReplyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleCommentReplyServiceImpl extends ServiceImpl<ComActNeighborCircleCommentReplyDAO, ComActNeighborCircleCommentReplyDO> implements ComActNeighborCircleCommentReplyService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentServiceImpl.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.ComActNeighborCircleCommentDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
import com.panzhihua.service_community.service.ComActNeighborCircleCommentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleCommentServiceImpl extends ServiceImpl<ComActNeighborCircleCommentDAO, ComActNeighborCircleCommentDO> implements ComActNeighborCircleCommentService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleFabulousServiceImpl.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.ComActNeighborCircleFabulousDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousDO;
import com.panzhihua.service_community.service.ComActNeighborCircleFabulousService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleFabulousServiceImpl extends ServiceImpl<ComActNeighborCircleFabulousDAO, ComActNeighborCircleFabulousDO> implements ComActNeighborCircleFabulousService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表服务实现类
 */
@Slf4j
@Service
public abstract class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {

    /**
     * 分页查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        return R.ok(doPager);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -417,7 +417,7 @@

    /**
     * 人员详情
     *
     *detailuser
     * @param userId 用户id
     * @return 人员详情
     */
@@ -1503,7 +1503,7 @@
            String idCard = sysUserDO.getIdCard();
            if (!ObjectUtils.isEmpty(idCard)) {
                communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
                communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
                communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
                communityUserInfoVO.setIdCard(idCard);
            }
            communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());