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 |   88 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 83 insertions(+), 5 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 15fc6ab..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
@@ -14,6 +14,7 @@
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 金汇社区
@@ -424,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);
 
     /**
      * 空间预约申请详情
@@ -583,7 +585,7 @@
 
 
     @GetMapping("/jinhuiShopping/shoppingGetDetails")
-    public R shoppingGetDetails(@RequestParam("id") String id);
+    public R shoppingGetDetails(@RequestParam("id") String id,@RequestParam("communityId") String communityId);
 
     /**
      * 新增
@@ -1002,7 +1004,12 @@
     public R expurgateReseauData(@RequestParam("id") String id);
 
 
-
+    /**
+     * 获取未绑定人员的网格
+     * @return
+     */
+    @GetMapping("/jinhuiReseau/getReseauBoxList")
+    public R getReseauBoxList();
 
     /********************************************************************************************************
      *
@@ -1067,12 +1074,83 @@
     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