From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 d72d941..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
@@ -2,8 +2,8 @@
import javax.annotation.Resource;
-import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
-import org.springframework.beans.BeanUtils;
+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.*;
@@ -17,6 +17,8 @@
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
@Slf4j
@RestController
@@ -105,7 +107,7 @@
* 请求参数
* @return 邻里圈列表
*/
- @PostMapping("pageNeighborByAdmin")
+ @PostMapping("pageNeighborByBigScreen")
public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
return comActNeighborCircleService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
}
@@ -378,6 +380,11 @@
return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
}
+ @GetMapping("/getNeighborTopicByAppNew")
+ public R getNeighborTopicByAppNew(@RequestParam("name") String name){
+ return comActNeighborCircleTopicService.getNeighborTopicByAppNew(name);
+ }
+
/**
* 删除话题
* @param id
@@ -413,14 +420,35 @@
* @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,
+ 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);
+ @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);
}
/**
--
Gitblit v1.7.1