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/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 304 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 284 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index b969dd5..0b0b1a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -12,6 +12,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
/**
* 金汇社区
*/
@@ -421,7 +425,8 @@
@RequestParam(value = "state",required = false) String state,
@RequestParam(value = "interspaceTime",required = false) String interspaceTime,
@RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
- @RequestParam(value = "interspaceId",required = false) String interspaceId);
+ @RequestParam(value = "interspaceId",required = false) String interspaceId,
+ @RequestParam(value = "userId",required = false) String userId);
/**
* 空间预约申请详情
@@ -580,7 +585,7 @@
@GetMapping("/jinhuiShopping/shoppingGetDetails")
- public R shoppingGetDetails(@RequestParam("id") String id);
+ public R shoppingGetDetails(@RequestParam("id") String id,@RequestParam("communityId") String communityId);
/**
* 新增
@@ -746,8 +751,19 @@
* @param
* @return
*/
-// R getList(int pageNum, int pageSize,
-// String goodName, String goodType, String id);
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetList")
+ public R experienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "activityName", required = false) String activityName,
+ @RequestParam(value = "activityType", required = false) String activityType,
+ @RequestParam(value = "starTime", required = false) Date starTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
/**
* 单个详情
@@ -755,7 +771,8 @@
* @return
*/
@GetMapping("/JinhuiExperience/experienceGetDetails")
- public R experienceGetDetails(@RequestParam("id") String id);
+ public R experienceGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
/**
* 新增
* @param
@@ -794,7 +811,8 @@
@GetMapping("/JinhuiArticle/articleGetList")
public R articleGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "articleType", required = false) String articleType);
+ @RequestParam(value = "articleType", required = false) String articleType,
+ @RequestParam(value = "conditionType", required = false) String conditionType);
/**
* 详情
@@ -830,8 +848,6 @@
-
-
/*******************************************************************************************************
*
* 金汇报名体验
@@ -843,19 +859,15 @@
* @param
* @return
*/
- @GetMapping("/applyExperienceGetList")
+ @GetMapping("/JinhuiExperience/applyExperienceGetList")
public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "isFeedback", required = false) String isFeedback,
@RequestParam(value = "activityId", required = false) String activityId);
- /**
- * 详情
- * @param id
- * @return
- */
- @GetMapping("/applyExperienceGetDetails")
+
+ @GetMapping("/JinhuiExperience/applyExperienceGetDetails")
public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "activityId", required = false) String activityId);
@@ -866,27 +878,279 @@
* @param
* @return
*/
- @PostMapping("/applyExperienceAddData")
+ @PostMapping("/JinhuiExperience/applyExperienceAddData")
public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @PostMapping("/JinhuiExperience/applyExperienceEditData")
+ public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @DeleteMapping("/JinhuiExperience/applyExperienceExpurgateData")
+ public R applyExperienceExpurgateData(@RequestParam("id") String id);
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceFilIn")
+ public R filIn(@RequestParam("userId") String userId,
+ @RequestParam("activityId") String activityId,
+ @RequestParam("content") String content);
+
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 定时任务
+ *
+ *
+ *******************************************************************************************************************/
+
+ //金汇社区定时任务
+ @GetMapping("/JinhuiExperience/timedTaskJinhuiActivitiesJobHandler")
+ public R timedTaskJinhuiActivitiesJobHandler();
+
+
+
+ /************************************************************************************************************
+ *
+ *
+ * 用户提交办理 /JinhuiWorkGuide/
+ *
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getList")
+ public R answerGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "transactType", required = false) String transactType);
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getDetails")
+ public R answerGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiWorkGuide/answer/addData")
+ public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
/**
* 编辑
* @param item
* @return
*/
- @PostMapping("/applyExperienceEditData")
- public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
+ @PostMapping("/JinhuiWorkGuide/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
/**
* 删除
* @param id
* @return
*/
- @DeleteMapping("/applyExperienceExpurgateData")
- public R applyExperienceExpurgateData(@RequestParam("id") String id);
+ @DeleteMapping("/JinhuiWorkGuide/answer/expurgateData")
+ public R answerExpurgateData(@RequestParam("id") String id);
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauList")
+ public R getReseauList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ @GetMapping("/jinhuiReseau/getReseauDetails")
+ public R getReseauDetails(@RequestParam("id")String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addReseauData")
+ public R addReseauData(@RequestBody JinhuiReseauVO item);
+
+
+ @PostMapping("/jinhuiReseau/editReseauData")
+ public R editReseauData(@RequestBody JinhuiReseauVO item);
+
+ @PostMapping("/jinhuiReseau/expurgateReseauData")
+ public R expurgateReseauData(@RequestParam("id") String id);
+
+
+ /**
+ * 获取未绑定人员的网格
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauBoxList")
+ public R getReseauBoxList();
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格员
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleList")
+ public R getPeopleList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 分页查询
+ * 获取本社区用户
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleUserList")
+ public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleDetails")
+ public R getPeopleDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addPeopleData")
+ public R addPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/editPeopleData")
+ public R editPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/jinhuiReseau/expurgatePeopleData")
+ public R expurgatePeopleData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityList")
+ public R getCharityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "title", required = false) String title,
+ @RequestParam(value = "label", required = false) String label,
+ @RequestParam(value = "state", required = false) String state);
+
+ /**
+ * 金汇大屏用
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getJinhuiCharityList")
+ public R getJinhuiCharityList();
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityDetails")
+ public R getCharityDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiCharity/addCharityData")
+ public R addCharityData(@RequestBody JinhuiCharityVO item);
+
+ @PostMapping("/JinhuiCharity/editCharityData")
+ public R editCharityData(@RequestBody JinhuiCharityVO item);
+
+ @DeleteMapping("/JinhuiCharity/expurgateCharityData")
+ public R expurgateCharityData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ * 金汇大屏
+ *
+ **************************************************************************************************************/
+ /**
+ * 金汇首页数据
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getIndexInfo")
+ public R getIndexInfo();
+
+
+ /**
+ * 金汇大屏社区服务
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getCommunityServices")
+ public R getCommunityServices();
+
+ /**
+ * 金汇居家养老
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getOldMan")
+ public R getOldMan();
}
--
Gitblit v1.7.1