From b7686f7f5fa3ab54c6bb0c34ca7f55a5aa58ec3c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 04 七月 2023 17:22:43 +0800
Subject: [PATCH] 修改街道新增报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 373 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 325 insertions(+), 48 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 7eea1ca..e1e7ef1 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,37 +1,39 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
-import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
-import com.panzhihua.service_community.service.ComActNeighborCircleService;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
+import org.springframework.beans.BeanUtils;
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 javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.R;
+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;
+import com.panzhihua.service_community.service.ComActNeighborCircleService;
+import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
+
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
-@RequestMapping("/neighbor")
+@RequestMapping("/neighbor/")
public class NeighborApi {
@Resource
private ComActNeighborCircleService comActNeighborCircleService;
+ @Resource
+ private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
/**
* 分页查询邻里圈列表
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("pageNeighborByApp")
public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
@@ -39,9 +41,33 @@
}
/**
+ * 分页查询可关联清单列表
+ * @param neighborCircleAppDTO
+ * @return
+ */
+ @PostMapping("pageRelationList")
+ public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.pageRelationList(neighborCircleAppDTO);
+ }
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("selectSolve")
+ public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.selectSolve(neighborCircleAppDTO);
+ }
+
+ /**
* 用户发布邻里圈审核
- * @param addNeighborCircleAppDTO 邻里圈请求参数
- * @return 发布结果
+ *
+ * @param addNeighborCircleAppDTO
+ * 邻里圈请求参数
+ * @return 发布结果
*/
@PostMapping("addNeighborByApp")
public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
@@ -50,8 +76,10 @@
/**
* 查询邻里圈详情
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈详情
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈详情
*/
@PostMapping("neighborDetailByApp")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
@@ -60,8 +88,10 @@
/**
* 管理后台查询邻里圈列表
- * @param comActNeighborCircleAdminDTO 请求参数
- * @return 邻里圈列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("pageNeighborByAdmin")
public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
@@ -69,18 +99,33 @@
}
/**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("pageNeighborByBigScreen")
+ public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+ return comActNeighborCircleService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
+ }
+ /**
* 后台添加邻里圈
- * @param addNeighborCircleAdminVO 请求参数
- * @return 邻里圈列表
+ *
+ * @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) {
@@ -88,20 +133,24 @@
}
/**
- * 后台修改邻里圈
- * @param id 邻里圈id
- * @return 邻里圈列表
+ * 邻里圈_后台删除 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
*/
@Transactional(rollbackFor = Exception.class)
@PostMapping("deleteByAdmin")
- public R deleteByAdmin(@RequestParam("id")Long id) {
+ public R deleteByAdmin(@RequestParam("id") Long id) {
return comActNeighborCircleService.deleteByAdmin(id);
}
/**
* 用户查询邻里圈列表
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("neighborExamineByApp")
public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
@@ -110,8 +159,10 @@
/**
* 邻里圈点赞
- * @param fabulousAppDTO 请求参数
- * @return 点赞结果
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 点赞结果
*/
@PostMapping("neighborFabulousByApp")
public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
@@ -120,8 +171,10 @@
/**
* 邻里圈转发
- * @param forwardAppDTO 请求参数
- * @return 转发结果
+ *
+ * @param forwardAppDTO
+ * 请求参数
+ * @return 转发结果
*/
@PostMapping("neighborForwardByApp")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
@@ -130,8 +183,10 @@
/**
* 邻里圈评论
- * @param commentAppDTO 请求参数
- * @return 评论结果
+ *
+ * @param commentAppDTO
+ * 请求参数
+ * @return 评论结果
*/
@PostMapping("neighborCommentByApp")
public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
@@ -140,8 +195,10 @@
/**
* 邻里圈回复
- * @param replyAppDTO 请求参数
- * @return 回复结果
+ *
+ * @param replyAppDTO
+ * 请求参数
+ * @return 回复结果
*/
@PostMapping("neighborReplyByApp")
public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
@@ -150,7 +207,8 @@
/**
* 定时任务更新邻里圈近3天评论数/点赞数/浏览量
- * @return 执行结果
+ *
+ * @return 执行结果
*/
@PostMapping("timeTaskCircleFlow")
public R timeTaskCircleFlow() {
@@ -158,9 +216,91 @@
}
/**
+ * 查看邻里圈基础_详情
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("detailNeighborByAdmin")
+ public R detailNeighborByAdmin(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborByAdmin(id);
+ }
+
+ /**
+ * 邻里圈的所有评论_分页
+ *
+ * @param dto
+ * 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("detailNeighborAllCommentByAdmin")
+ public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
+ return comActNeighborCircleService.detailNeighborAllCommentByAdmin(dto);
+ }
+
+ /**
+ * 评论的状态_修改
+ *
+ * @param vo
+ * 请求参数
+ */
+ @PostMapping("changeCommentStatusByAdmin")
+ @Transactional(rollbackFor = Exception.class)
+ public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
+ return comActNeighborCircleService.changeCommentStatusByAdmin(vo);
+ }
+
+ /**
+ * 邻里圈评论_详情
+ *
+ * @param id
+ * 评论id
+ */
+ @GetMapping("detailNeighborCommentByAdmin")
+ public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborCommentByAdmin(id);
+ }
+
+ /**
+ * 邻里圈评论回复_分页
+ *
+ * @param dto
+ * 参数
+ */
+ @PostMapping("detailNeighborCommentAllReply")
+ public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
+ return comActNeighborCircleService.detailNeighborCommentAllReply(dto);
+ }
+
+ /**
+ * 邻里圈评论回复_基本详情
+ *
+ * @param id
+ * 参数
+ */
+ @GetMapping("detailNeighborCommentReply")
+ public R detailNeighborCommentReply(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborCommentReply(id);
+ }
+
+ /**
+ * 评论的状态_修改
+ *
+ * @param changeStatusReplyVO
+ * 参数
+ */
+ @PostMapping("changeCommentReplyStatusByAdmin")
+ public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
+ return comActNeighborCircleService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
+ }
+
+ /**
* 邻里圈取消点赞
- * @param fabulousAppDTO 请求参数
- * @return 取消点赞结果
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 取消点赞结果
*/
@PostMapping("neighborFabulousCancelByApp")
public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
@@ -169,12 +309,149 @@
/**
* 添加邻里圈浏览记录
- * @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);
+ }
+
+ /**
+ * 小程序查询邻里圈话题列表
+ *
+ * 社区id
+ * @return 邻里圈话题列表
+ */
+ @GetMapping("getNeighborTopicByApp")
+ public R getNeighborTopicByApp(@RequestParam("name") String name) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
+ }
+
+ /**
+ * 删除话题
+ * @param id
+ * @return
+ */
+ @GetMapping("deleteNeighborTopic")
+ public R deleteNeighborTopic(@RequestParam("id") Long id){
+ return comActNeighborCircleTopicService.delete(id);
+ }
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("deleteNeighborByApp")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO){
+ return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO);
+ }
+
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @PostMapping("update")
+ public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
+ return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO);
+ }
+
+ /**
+ * 机关单位服务统计排行
+ * @return
+ * */
+ @GetMapping("/activityAnalysis")
+ public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
+ }
+
+ /**
+ * 小程序服务统计
+ * @param serviceStaticDTO
+ * @return
+ */
+ @PostMapping("/serviceStatic")
+ public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
+ return this.comActNeighborCircleService.serviceStatic(serviceStaticDTO);
+ }
+
+ /**
+ * 后台统计
+ * @param serviceStaticDTO
+ * @return
+ */
+ @PostMapping("/serviceStaticBackstage")
+ public R serviceStaticBackstage(@RequestBody ServiceStaticBackstageDTO serviceStaticDTO){
+ return this.comActNeighborCircleService.serviceStaticBackstage(serviceStaticDTO);
+ }
+ /**
+ * 求助我的问题数量统计
+ * @param type
+ * @param phone
+ * @return
+ */
+ @GetMapping("/selectCount")
+ public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
+ return this.comActNeighborCircleService.selectCount(type,phone,communityId);
+ }
+
+
}
--
Gitblit v1.7.1