From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 290 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 228 insertions(+), 62 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 3813fc0..2245348 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,12 @@
package com.panzhihua.service_community.api;
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.dtos.ExcelDO;
+import com.panzhihua.common.model.dtos.PartyExcelDO;
+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;
@@ -8,16 +15,10 @@
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.*;
-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 lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
@Slf4j
@RestController
@@ -31,8 +32,10 @@
/**
* 分页查询邻里圈列表
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("pageNeighborByApp")
public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
@@ -40,9 +43,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) {
@@ -51,8 +78,10 @@
/**
* 查询邻里圈详情
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈详情
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈详情
*/
@PostMapping("neighborDetailByApp")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
@@ -61,7 +90,9 @@
/**
* 管理后台查询邻里圈列表
- * @param comActNeighborCircleAdminDTO 请求参数
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
* @return 邻里圈列表
*/
@PostMapping("pageNeighborByAdmin")
@@ -70,8 +101,21 @@
}
/**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("pageNeighborByBigScreen")
+ public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+ return comActNeighborCircleService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
+ }
+ /**
* 后台添加邻里圈
- * @param addNeighborCircleAdminVO 请求参数
+ *
+ * @param addNeighborCircleAdminVO
+ * 请求参数
* @return 邻里圈列表
*/
@PostMapping("addNeighborByAdmin")
@@ -81,7 +125,9 @@
/**
* 后台修改邻里圈
- * @param editNeighborCircleAdminVO 请求参数
+ *
+ * @param editNeighborCircleAdminVO
+ * 请求参数
*/
@PostMapping("changeStatusByAdmin")
public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
@@ -89,9 +135,10 @@
}
/**
- * 邻里圈_后台删除
- * 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
- * @param id 邻里圈id
+ * 邻里圈_后台删除 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
+ *
+ * @param id
+ * 邻里圈id
* @return 邻里圈列表
*/
@Transactional(rollbackFor = Exception.class)
@@ -102,8 +149,10 @@
/**
* 用户查询邻里圈列表
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("neighborExamineByApp")
public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
@@ -112,8 +161,10 @@
/**
* 邻里圈点赞
- * @param fabulousAppDTO 请求参数
- * @return 点赞结果
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 点赞结果
*/
@PostMapping("neighborFabulousByApp")
public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
@@ -122,8 +173,10 @@
/**
* 邻里圈转发
- * @param forwardAppDTO 请求参数
- * @return 转发结果
+ *
+ * @param forwardAppDTO
+ * 请求参数
+ * @return 转发结果
*/
@PostMapping("neighborForwardByApp")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
@@ -132,8 +185,10 @@
/**
* 邻里圈评论
- * @param commentAppDTO 请求参数
- * @return 评论结果
+ *
+ * @param commentAppDTO
+ * 请求参数
+ * @return 评论结果
*/
@PostMapping("neighborCommentByApp")
public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
@@ -142,8 +197,10 @@
/**
* 邻里圈回复
- * @param replyAppDTO 请求参数
- * @return 回复结果
+ *
+ * @param replyAppDTO
+ * 请求参数
+ * @return 回复结果
*/
@PostMapping("neighborReplyByApp")
public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
@@ -152,7 +209,8 @@
/**
* 定时任务更新邻里圈近3天评论数/点赞数/浏览量
- * @return 执行结果
+ *
+ * @return 执行结果
*/
@PostMapping("timeTaskCircleFlow")
public R timeTaskCircleFlow() {
@@ -161,7 +219,9 @@
/**
* 查看邻里圈基础_详情
- * @param id 邻里圈id
+ *
+ * @param id
+ * 邻里圈id
* @return 邻里圈列表
*/
@GetMapping("detailNeighborByAdmin")
@@ -169,10 +229,11 @@
return comActNeighborCircleService.detailNeighborByAdmin(id);
}
-
/**
* 邻里圈的所有评论_分页
- * @param dto 请求参数
+ *
+ * @param dto
+ * 请求参数
* @return 评论列表
*/
@PostMapping("detailNeighborAllCommentByAdmin")
@@ -182,7 +243,9 @@
/**
* 评论的状态_修改
- * @param vo 请求参数
+ *
+ * @param vo
+ * 请求参数
*/
@PostMapping("changeCommentStatusByAdmin")
@Transactional(rollbackFor = Exception.class)
@@ -192,7 +255,9 @@
/**
* 邻里圈评论_详情
- * @param id 评论id
+ *
+ * @param id
+ * 评论id
*/
@GetMapping("detailNeighborCommentByAdmin")
public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
@@ -201,7 +266,9 @@
/**
* 邻里圈评论回复_分页
- * @param dto 参数
+ *
+ * @param dto
+ * 参数
*/
@PostMapping("detailNeighborCommentAllReply")
public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
@@ -210,7 +277,9 @@
/**
* 邻里圈评论回复_基本详情
- * @param id 参数
+ *
+ * @param id
+ * 参数
*/
@GetMapping("detailNeighborCommentReply")
public R detailNeighborCommentReply(@RequestParam("id") Long id) {
@@ -219,7 +288,9 @@
/**
* 评论的状态_修改
- * @param changeStatusReplyVO 参数
+ *
+ * @param changeStatusReplyVO
+ * 参数
*/
@PostMapping("changeCommentReplyStatusByAdmin")
public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
@@ -228,8 +299,10 @@
/**
* 邻里圈取消点赞
- * @param fabulousAppDTO 请求参数
- * @return 取消点赞结果
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 取消点赞结果
*/
@PostMapping("neighborFabulousCancelByApp")
public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
@@ -238,8 +311,10 @@
/**
* 添加邻里圈浏览记录
- * @param addBrowseAppDTO 请求参数
- * @return 返回参数
+ *
+ * @param addBrowseAppDTO
+ * 请求参数
+ * @return 返回参数
*/
@PostMapping("neighborAddBrowseByApp")
public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
@@ -248,8 +323,10 @@
/**
* 分页查询评论下所有回复
- * @param commentReplyAppDTO 请求参数
- * @return 回复列表
+ *
+ * @param commentReplyAppDTO
+ * 请求参数
+ * @return 回复列表
*/
@PostMapping("neighborCommentReplyByApp")
public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
@@ -258,8 +335,10 @@
/**
* 分页查询邻里圈话题列表
- * @param circleTopicAdminDTO 请求参数
- * @return 邻里圈话题列表
+ *
+ * @param circleTopicAdminDTO
+ * 请求参数
+ * @return 邻里圈话题列表
*/
@PostMapping("pageNeighborTopicByAdmin")
public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
@@ -268,8 +347,10 @@
/**
* 添加邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 添加结果
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 添加结果
*/
@PostMapping("addNeighborTopicByAdmin")
public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
@@ -278,8 +359,10 @@
/**
* 编辑邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 编辑结果
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 编辑结果
*/
@PostMapping("editNeighborTopicByAdmin")
public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
@@ -288,22 +371,28 @@
/**
* 小程序查询邻里圈话题列表
- * @param communityId 社区id
- * @return 邻里圈话题列表
+ *
+ * 社区id
+ * @return 邻里圈话题列表
*/
@GetMapping("getNeighborTopicByApp")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero) {
- return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero);
+ public R getNeighborTopicByApp(@RequestParam("name") String name) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
+ }
+
+ @GetMapping("/getNeighborTopicByAppNew")
+ public R getNeighborTopicByAppNew(@RequestParam("name") String name){
+ return comActNeighborCircleTopicService.getNeighborTopicByAppNew(name);
}
/**
- * 小程序-用户新增话题
- * @param circleTopicAppDTO 请求参数
- * @return 新增结果
+ * 删除话题
+ * @param id
+ * @return
*/
- @PostMapping("addNeighborTopicByApp")
- public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
- return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO);
+ @GetMapping("deleteNeighborTopic")
+ public R deleteNeighborTopic(@RequestParam("id") Long id){
+ return comActNeighborCircleTopicService.delete(id);
}
/**
@@ -316,4 +405,81 @@
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,
+ @RequestParam(value = "searchContent",required = false) String searchContent){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,searchContent);
+ }
+
+ /**
+ * 导出
+ */
+ @GetMapping("/export")
+ public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId) throws Exception {
+ return this.comActNeighborCircleService.export(year,belongTo,communityId);
+ }
+
+ @GetMapping("/partyExcel")
+ public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "unitId",required = false) Long unitId){
+ return this.comActNeighborCircleService.partyExcel(year,belongTo,communityId,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