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

xyh

2021-06-18 aa9d5899deda2c9a9c4da111e89509136f1c4ec2

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

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
@@ -37,6 +38,11 @@
            return R.fail("请先绑定社区");
        }
        neighborCircleAppDTO.setCommunityId(communityId);

        Long userId = this.getLoginUserInfo().getUserId();
        if(userId != null){
            neighborCircleAppDTO.setUserId(userId);
        }
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
    }

@@ -61,6 +67,11 @@
    @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
    @PostMapping("detail")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
            return R.fail("请先登录");
        }
        neighborCircleAppDTO.setUserId(userId);
        return communityService.neighborDetailByApp(neighborCircleAppDTO);
    }

@@ -141,5 +152,15 @@
        return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
    }

    @ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
    @PostMapping("comment/reply")
    public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
            return R.fail("请先登录");
        }
        commentReplyAppDTO.setUserId(userId);
        return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
    }
}