Merge remote-tracking branch 'origin/test' into test

CeDo

2021-04-29 28fe398869497f0347977bd54818c1203ac022b6

Merge remote-tracking branch 'origin/test' into test

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

@@ -24,7 +24,7 @@
    private Integer fabulousNum;

    @ApiModelProperty("评论用户")
    private Long userName;
    private String userName;


    @ApiModelProperty("评论用户手机号")
@@ -33,4 +33,8 @@
    @ApiModelProperty("评论时间")
    private Date createAt;


    @ApiModelProperty("状态（1.显示 2.隐藏）")
    private Integer status;

}

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

@@ -21,13 +21,16 @@
    private Long circleId;

    @ApiModelProperty("评论用户")
    private Long userName;
    private String userName;

    @ApiModelProperty("用户昵称")
    private String userNickName;

    @ApiModelProperty("评论用户手机号")
    private String userPhone;

    @ApiModelProperty("评论内容")
    private String content;
    @ApiModelProperty("内容")
    private String replyContent;

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

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

@@ -22,6 +22,7 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
@@ -2410,4 +2411,12 @@
    @PostMapping("/neighbor/neighborAddBrowseByApp")
    R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);


    /**
     * 邻里圈_添加
     * @param addNeighborCircleAdminVO 参数
     */
    @PostMapping("/neighbor/addNeighborByAdmin")
    R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);

}

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

@@ -92,7 +92,7 @@


    @ApiOperation(value = "邻里圈评论回复_基本详情",response = ComActNeighborCommentReplyByAdminVO.class)
    @PostMapping("detailNeighborCommentReply")
    @GetMapping("detailNeighborCommentReply")
    R detailNeighborCommentReply(@RequestParam("id") Long id){
        return communityService.detailNeighborCommentReply(id);
    }
@@ -104,4 +104,13 @@
        return communityService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
    }


    @ApiOperation(value = "邻里圈_添加")
    @PostMapping("addNeighborByAdmin")
    R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO){
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        addNeighborCircleAdminVO.setUserId(loginUserInfo.getUserId());
        return communityService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }

}

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

@@ -208,7 +208,7 @@
     * 邻里圈评论回复_基本详情
     * @param id 参数
     */
    @PostMapping("detailNeighborCommentReply")
    @GetMapping("detailNeighborCommentReply")
    public R detailNeighborCommentReply(@RequestParam("id") Long id) {
        return comActNeighborCircleService.detailNeighborCommentReply(id);
    }

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

@@ -40,11 +40,11 @@
    @Select("<script> " +
            "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
            "circle_id = #{dto.id}"+
            "<if test='dto.id != null and dto.id!= 0l'>" +
            "nc.circle_id = #{dto.id}"+
            " </if> " +
            "</where>"+
            " ORDER BY create_at"+
            "</script>")
    IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
    IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page,@Param("dto") DetailNeighborAllCommentByAdminDTO dto);
}

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

@@ -33,14 +33,14 @@
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);

    @Select("<script> " +
            "select cr.*,u.name as userName from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  " +
            "select cr.*,u.name as userName,u.phone as userPhone,u.nick_name as userNickName  from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
            "comment_id = #{dto.id}"+
            "<if test='dto.id != null and dto.id!= 0l'>" +
            "cr.comment_id = #{dto.id}"+
            " </if> " +
            "</where>"+
            " ORDER BY create_at"+
            " ORDER BY cr.create_at"+
            "</script>")
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page<ComActNeighborCircleCommentReplyDO> page, DetailNeighborCommentReplyByAdminDTO dto);
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page page,@Param("dto") DetailNeighborCommentReplyByAdminDTO dto);

}

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

@@ -224,7 +224,9 @@
            return R.fail("id有误！");
        }
        neighborCircleDO.setStatus(editVO.getStatus());
        if(editVO.getRefuseReason()!=null){
        neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
        }
        this.baseMapper.updateById(neighborCircleDO);
        return R.ok();
    }
@@ -501,8 +503,10 @@
        if(commentDO==null){
            return R.fail("id有误!");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
        ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
        BeanUtils.copyProperties(commentDO,vo);
        vo.setUserName(user.getName());
        return R.ok(vo);
    }

@@ -510,6 +514,9 @@
    public R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto) {
        Page<ComActNeighborCircleCommentReplyDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
        Page<ComActNeighborCommentReplyByAdminVO> replyPage = neighborCircleCommentReplyDAO.selectListByComment(page, dto);
        replyPage.getRecords().forEach(reply->{

        });
        return R.ok(replyPage);
    }

@@ -519,8 +526,11 @@
        if(replyDO==null){
            return R.fail("id有误!");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(replyDO.getUserId());
        ComActNeighborCommentReplyByAdminVO vo = new ComActNeighborCommentReplyByAdminVO();
        BeanUtils.copyProperties(replyDO,vo);
        vo.setUserName(user.getName());
        vo.setUserPhone(user.getPhone());
        return R.ok(vo);
    }