From 5a8a90c095280fbd2106869ecd2bad10e01a57a6 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期四, 23 十二月 2021 18:10:22 +0800 Subject: [PATCH] 12/23 大屏修改 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 214 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 168 insertions(+), 46 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java index ec48d95..e179c8a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java @@ -1,5 +1,10 @@ package com.panzhihua.service_community.api; +import javax.annotation.Resource; + +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO; @@ -7,16 +12,9 @@ import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; import com.panzhihua.service_community.service.ComActNeighborCircleService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -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; +import com.panzhihua.service_community.service.ComActNeighborCircleTopicService; -import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; @Slf4j @RestController @@ -25,11 +23,15 @@ @Resource private ComActNeighborCircleService comActNeighborCircleService; + @Resource + private ComActNeighborCircleTopicService comActNeighborCircleTopicService; /** * 分页查询邻里圈列表 - * @param neighborCircleAppDTO 请求参数 - * @return 邻里圈列表 + * + * @param neighborCircleAppDTO + * 请求参数 + * @return 邻里圈列表 */ @PostMapping("pageNeighborByApp") public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { @@ -38,8 +40,10 @@ /** * 用户发布邻里圈审核 - * @param addNeighborCircleAppDTO 邻里圈请求参数 - * @return 发布结果 + * + * @param addNeighborCircleAppDTO + * 邻里圈请求参数 + * @return 发布结果 */ @PostMapping("addNeighborByApp") public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) { @@ -48,8 +52,10 @@ /** * 查询邻里圈详情 - * @param neighborCircleAppDTO 请求参数 - * @return 邻里圈详情 + * + * @param neighborCircleAppDTO + * 请求参数 + * @return 邻里圈详情 */ @PostMapping("neighborDetailByApp") public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) { @@ -58,7 +64,9 @@ /** * 管理后台查询邻里圈列表 - * @param comActNeighborCircleAdminDTO 请求参数 + * + * @param comActNeighborCircleAdminDTO + * 请求参数 * @return 邻里圈列表 */ @PostMapping("pageNeighborByAdmin") @@ -68,17 +76,21 @@ /** * 后台添加邻里圈 - * @param addNeighborCircleAdminVO 请求参数 + * + * @param addNeighborCircleAdminVO + * 请求参数 * @return 邻里圈列表 */ @PostMapping("addNeighborByAdmin") - public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) { + public R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) { return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO); } /** * 后台修改邻里圈 - * @param editNeighborCircleAdminVO 请求参数 + * + * @param editNeighborCircleAdminVO + * 请求参数 */ @PostMapping("changeStatusByAdmin") public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) { @@ -86,9 +98,10 @@ } /** - * 邻里圈_后台删除 - * 待审核状态不可删除,显示、隐藏、已驳回的都可以删除) - * @param id 邻里圈id + * 邻里圈_后台删除 待审核状态不可删除,显示、隐藏、已驳回的都可以删除) + * + * @param id + * 邻里圈id * @return 邻里圈列表 */ @Transactional(rollbackFor = Exception.class) @@ -99,8 +112,10 @@ /** * 用户查询邻里圈列表 - * @param neighborCircleAppDTO 请求参数 - * @return 邻里圈列表 + * + * @param neighborCircleAppDTO + * 请求参数 + * @return 邻里圈列表 */ @PostMapping("neighborExamineByApp") public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { @@ -109,8 +124,10 @@ /** * 邻里圈点赞 - * @param fabulousAppDTO 请求参数 - * @return 点赞结果 + * + * @param fabulousAppDTO + * 请求参数 + * @return 点赞结果 */ @PostMapping("neighborFabulousByApp") public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) { @@ -119,8 +136,10 @@ /** * 邻里圈转发 - * @param forwardAppDTO 请求参数 - * @return 转发结果 + * + * @param forwardAppDTO + * 请求参数 + * @return 转发结果 */ @PostMapping("neighborForwardByApp") public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) { @@ -129,8 +148,10 @@ /** * 邻里圈评论 - * @param commentAppDTO 请求参数 - * @return 评论结果 + * + * @param commentAppDTO + * 请求参数 + * @return 评论结果 */ @PostMapping("neighborCommentByApp") public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) { @@ -139,8 +160,10 @@ /** * 邻里圈回复 - * @param replyAppDTO 请求参数 - * @return 回复结果 + * + * @param replyAppDTO + * 请求参数 + * @return 回复结果 */ @PostMapping("neighborReplyByApp") public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) { @@ -149,7 +172,8 @@ /** * 定时任务更新邻里圈近3天评论数/点赞数/浏览量 - * @return 执行结果 + * + * @return 执行结果 */ @PostMapping("timeTaskCircleFlow") public R timeTaskCircleFlow() { @@ -158,7 +182,9 @@ /** * 查看邻里圈基础_详情 - * @param id 邻里圈id + * + * @param id + * 邻里圈id * @return 邻里圈列表 */ @GetMapping("detailNeighborByAdmin") @@ -166,10 +192,11 @@ return comActNeighborCircleService.detailNeighborByAdmin(id); } - /** * 邻里圈的所有评论_分页 - * @param dto 请求参数 + * + * @param dto + * 请求参数 * @return 评论列表 */ @PostMapping("detailNeighborAllCommentByAdmin") @@ -179,16 +206,21 @@ /** * 评论的状态_修改 - * @param vo 请求参数 + * + * @param vo + * 请求参数 */ @PostMapping("changeCommentStatusByAdmin") + @Transactional(rollbackFor = Exception.class) public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) { return comActNeighborCircleService.changeCommentStatusByAdmin(vo); } /** * 邻里圈评论_详情 - * @param id 评论id + * + * @param id + * 评论id */ @GetMapping("detailNeighborCommentByAdmin") public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) { @@ -197,7 +229,9 @@ /** * 邻里圈评论回复_分页 - * @param dto 参数 + * + * @param dto + * 参数 */ @PostMapping("detailNeighborCommentAllReply") public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) { @@ -206,16 +240,20 @@ /** * 邻里圈评论回复_基本详情 - * @param id 参数 + * + * @param id + * 参数 */ - @PostMapping("detailNeighborCommentReply") + @GetMapping("detailNeighborCommentReply") public R detailNeighborCommentReply(@RequestParam("id") Long id) { return comActNeighborCircleService.detailNeighborCommentReply(id); } /** * 评论的状态_修改 - * @param changeStatusReplyVO 参数 + * + * @param changeStatusReplyVO + * 参数 */ @PostMapping("changeCommentReplyStatusByAdmin") public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) { @@ -224,8 +262,10 @@ /** * 邻里圈取消点赞 - * @param fabulousAppDTO 请求参数 - * @return 取消点赞结果 + * + * @param fabulousAppDTO + * 请求参数 + * @return 取消点赞结果 */ @PostMapping("neighborFabulousCancelByApp") public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) { @@ -234,12 +274,94 @@ /** * 添加邻里圈浏览记录 - * @param addBrowseAppDTO 请求参数 - * @return 返回参数 + * + * @param addBrowseAppDTO + * 请求参数 + * @return 返回参数 */ @PostMapping("neighborAddBrowseByApp") public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) { return comActNeighborCircleService.neighborAddBrowseByApp(addBrowseAppDTO); } + /** + * 分页查询评论下所有回复 + * + * @param commentReplyAppDTO + * 请求参数 + * @return 回复列表 + */ + @PostMapping("neighborCommentReplyByApp") + public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) { + return comActNeighborCircleService.neighborCommentReplyByApp(commentReplyAppDTO); + } + + /** + * 分页查询邻里圈话题列表 + * + * @param circleTopicAdminDTO + * 请求参数 + * @return 邻里圈话题列表 + */ + @PostMapping("pageNeighborTopicByAdmin") + public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) { + return comActNeighborCircleTopicService.pageNeighborTopicByAdmin(circleTopicAdminDTO); + } + + /** + * 添加邻里圈话题 + * + * @param addCircleTopicAdminDTO + * 请求参数 + * @return 添加结果 + */ + @PostMapping("addNeighborTopicByAdmin") + public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) { + return comActNeighborCircleTopicService.addNeighborTopicByAdmin(addCircleTopicAdminDTO); + } + + /** + * 编辑邻里圈话题 + * + * @param addCircleTopicAdminDTO + * 请求参数 + * @return 编辑结果 + */ + @PostMapping("editNeighborTopicByAdmin") + public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) { + return comActNeighborCircleTopicService.editNeighborTopicByAdmin(addCircleTopicAdminDTO); + } + + /** + * 小程序查询邻里圈话题列表 + * + * @param communityId + * 社区id + * @return 邻里圈话题列表 + */ + @GetMapping("getNeighborTopicByApp") + public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name) { + return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name); + } + + /** + * 小程序-用户新增话题 + * @param circleTopicAppDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("addNeighborTopicByApp") + public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){ + return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO); + } + + /** + * 小程序-删除邻里圈 + * @param circleTopicAppDTO 请求参数 + * @return 删除结果 + */ + @PostMapping("deleteNeighborByApp") + public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO){ + return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO); + } + } -- Gitblit v1.7.1