From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 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..52bc6cf 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
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
+import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@
@Resource
private ComActNeighborCircleService comActNeighborCircleService;
+ @Resource
+ private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
/**
* 分页查询邻里圈列表
@@ -72,7 +75,7 @@
* @return 邻里圈列表
*/
@PostMapping("addNeighborByAdmin")
- public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
+ public R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO);
}
@@ -182,6 +185,7 @@
* @param vo 请求参数
*/
@PostMapping("changeCommentStatusByAdmin")
+ @Transactional(rollbackFor = Exception.class)
public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
return comActNeighborCircleService.changeCommentStatusByAdmin(vo);
}
@@ -208,7 +212,7 @@
* 邻里圈评论回复_基本详情
* @param id 参数
*/
- @PostMapping("detailNeighborCommentReply")
+ @GetMapping("detailNeighborCommentReply")
public R detailNeighborCommentReply(@RequestParam("id") Long id) {
return comActNeighborCircleService.detailNeighborCommentReply(id);
}
@@ -242,4 +246,54 @@
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) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId);
+ }
+
}
--
Gitblit v1.7.1