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 | 471 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 468 insertions(+), 3 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 ff343e9..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;
+
/**
* 金汇社区
*/
@@ -211,7 +215,7 @@
* @return
*/
@DeleteMapping("/jinhuiMerchant/delete")
- public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator);
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId);
/**
* 分页查询便民服务商家 运营后台
@@ -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);
/**
* 新增
@@ -688,4 +693,464 @@
@DeleteMapping("/jinhuiConfig/configExpurgateData")
public R configExpurgateData(@RequestParam("communityId") String communityId);
+
+
+ /*************************************************************************************************************
+ *
+ *
+ * 商家分类
+ *
+ *
+ **************************************************************************************************************/
+
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getDetailsCategories")
+ public R getDetailsCategories(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/addDataCategories")
+ public R addDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/editDataCategories")
+ public R editDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/expurgateDataCategories")
+ public R expurgateDataCategories(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇体验活动
+ *
+ *
+ **********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ /**
+ * 分页查询
+ *
+ * @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);
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceAddData")
+ public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceEditData")
+ public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceExpurgateData")
+ public R experienceExpurgateData(@RequestParam("id") String id);
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "articleType", required = false) String articleType,
+ @RequestParam(value = "conditionType", required = false) String conditionType);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleAddData")
+ public R articleAddData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleEditData")
+ public R articleEditData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleExpurgateData")
+ public R articleExpurgateData(@RequestParam("id") String id);
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @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);
+
+
+ @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);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @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("/JinhuiWorkGuide/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @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