From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 14 十一月 2023 17:49:20 +0800 Subject: [PATCH] 修改打卡 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 79 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 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 2f08361..3a1b073 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; /** * 金汇社区 @@ -1002,7 +1003,12 @@ public R expurgateReseauData(@RequestParam("id") String id); - + /** + * 获取未绑定人员的网格 + * @return + */ + @GetMapping("/jinhuiReseau/getReseauBoxList") + public R getReseauBoxList(); /******************************************************************************************************** * @@ -1028,9 +1034,10 @@ * @param * @return */ - @GetMapping("/getPeopleUserList") + @GetMapping("/jinhuiReseau/getPeopleUserList") public R getPeopleUserList(@RequestParam("pageNum") int pageNum, - @RequestParam("pageSize") int pageSize); + @RequestParam("pageSize") int pageSize, + @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone); /** * 详情 @@ -1066,12 +1073,74 @@ 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 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