From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +0800 Subject: [PATCH] 党员、诉求评论基础代码 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 182 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 176 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java index 9966ad9..372cf63 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -49,11 +50,15 @@ public R getNeedProblemList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "search", required = false)String search, + @RequestParam(value = "classifyId", required = false)String classifyId, @RequestParam(value = "status", required = false)String status, @RequestParam(value = "kind", required = false)String kind, @RequestParam(value = "userId", required = false)String userId, @RequestParam(value = "userIds", required = false)String userIds, - @RequestParam(value = "communityId", required = false)String communityId); + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "isDisplay", required = false)String isDisplay, + @RequestParam(value = "startTime", required = false) Date startTime, + @RequestParam(value = "endTime", required = false) Date endTime); @GetMapping("/NeedProblem/getMyJoinNeedProblemList") public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum, @@ -62,7 +67,10 @@ @RequestParam(value = "status", required = false)String status, @RequestParam(value = "kind", required = false)String kind, @RequestParam(value = "userIds", required = false)String userIds, - @RequestParam(value = "userId", required = false)String userId); + @RequestParam(value = "userId", required = false)String userId, + @RequestParam(value = "isDisplay", required = false)String isDisplay, + @RequestParam(value = "startTime", required = false) Date startTime, + @RequestParam(value = "endTime", required = false) Date endTime); @GetMapping("/NeedProblem/getDetails") @@ -119,8 +127,10 @@ @GetMapping("/NeedTask/getNeedTaskList") public R getNeedTaskList(@RequestParam("pageNum") int pageNum, - @RequestParam("pageNum") int pageSize, - @RequestParam(value = "unitId", required = false) String unitId); + @RequestParam("pageSize") int pageSize, + @RequestParam(value = "unitId", required = false) String unitId, + @RequestParam(value = "kind", required = false) String kind, + @RequestParam(value = "status", required = false) String status); @GetMapping("/NeedTask/getNeedTaskDetails") public R getNeedTaskDetails(@RequestParam("id") String id); @@ -250,7 +260,8 @@ public R getResourceSharingList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "communityId", required = false)String communityId, - @RequestParam(value = "unitId", required = false)String unitId); + @RequestParam(value = "unitId", required = false)String unitId, + @RequestParam(value = "meritId", required = false) String meritId); @GetMapping("/ResourceSharing/getResourceSharingDetails") public R getResourceSharingDetails(@RequestParam("id") String id); @@ -378,6 +389,22 @@ public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item); + @GetMapping("/FightConvenient/selectUserList") + public R selectUserList(@RequestParam("communityId") String communityId, + @RequestParam("phoneOrname") String phoneOrname); + + + + @GetMapping("/FightConvenient/selectUserListB") + public R selectUserListB(@RequestParam("communityId") String communityId, + @RequestParam("phoneOrname") String phoneOrname); + + + + @GetMapping("/FightConvenient/selectUserBind") + public R selectUserBind(@RequestParam("communityId") String communityId, + @RequestParam("userId") String userId); + /***************************************************************************************************** * * 用户积分任务完成情况 @@ -409,6 +436,18 @@ @PostMapping("/IntegratingTask/upIntegral") public R upIntegral(@RequestBody NewFightIntegral item); + + /** + * 每日签到记录列表 前15条 + * @param userId + * @param communityId + * @return + */ + @GetMapping("/IntegratingTask/getEverydayList") + public R getEverydayList(@RequestParam("userId") String userId, + @RequestParam("communityId") String communityId); + + /******************************************************************************************************************* * @@ -429,7 +468,9 @@ @RequestParam(value = "goodName", required = false)String goodName, @RequestParam(value = "name", required = false)String name, @RequestParam(value = "cancelType", required = false)String cancelType, - @RequestParam(value = "communityId", required = false)String communityId); + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "merchantId", required = false) String merchantId, + @RequestParam(value = "orderType", required = false) String orderType); /** * 分页详情 @@ -478,4 +519,133 @@ @RequestParam(value = "communityId") String communityId); + + + + + + + + + + /** + * 每日定时清空 定时任务 + */ + @GetMapping("/IntegratingTask/everydaYtruncateData") + public R truncateData(); + + + /** + * 新双争双评需求问题清单 任务认领 开始 结束 定时任务 + * @return + */ + @PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler") + public R timedNewFightNeedProblemInventoryHandler(); + + + //定时任务 社区组织共建 定时更新项目进度 + @PostMapping("/NewFightCommunity/taskTimed/getListTime") + public R taskTimedGetListTime(); + + + /****************************************************************************************************************** + * + * 街道大屏 + * + *****************************************************************************************************************/ + + + @GetMapping("/StreetBigScreen/getCommunityId") + public R getCommunityId(@RequestParam("streetId") String streetId); + + + /** + * 获取核心指标数据 + * @param streetId + * @return + */ + @GetMapping("/StreetBigScreen/getCoreData") + public R getCoreData(@RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "type", required = false)String type, + @RequestParam(value = "starTime", required = false)String starTime, + @RequestParam(value = "endTime", required = false)String endTime); + + + /** + * 获取三务三资数据 + * @param streetId + * @param communityId + * @param type + * @param starTime + * @param endTime + * @return + */ + @GetMapping("/StreetBigScreen/getThreeNum") + public R getThreeNum(@RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "type", required = false)String type, + @RequestParam(value = "starTime", required = false)String starTime, + @RequestParam(value = "endTime", required = false)String endTime); + + + + /** + * 双报到双服务 + * @param streetId + * @param communityId + * @param type + * @param starTime + * @param endTime + * @return + */ + @GetMapping("/StreetBigScreen/getDoubleRegistration") + public R getDoubleRegistration(@RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "type", required = false)String type, + @RequestParam(value = "starTime", required = false)String starTime, + @RequestParam(value = "endTime", required = false)String endTime); + + /** + * 随手拍 微心愿 + * @param streetId + * @param communityId + * @param type + * @param starTime + * @param endTime + * @return + */ + @GetMapping("/StreetBigScreen/getPhotoMicroWish") + public R getPhotoMicroWish(@RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "type", required = false)String type, + @RequestParam(value = "starTime", required = false)String starTime, + @RequestParam(value = "endTime", required = false)String endTime); + + + + /** + * 社区活动、议事投票、问卷调查、社区动态发布趋势 + * @param streetId + * @param communityId + * @param type + * @param starTime + * @param endTime + * @return + */ + @GetMapping("/StreetBigScreen/getAllData") + public R getAllData(@RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "communityId", required = false)String communityId, + @RequestParam(value = "type", required = false)String type, + @RequestParam(value = "starTime", required = false)String starTime, + @RequestParam(value = "endTime", required = false)String endTime); + + + /** + * 新双争双评需求问题清单 签退时间更新 + * @return + */ + @GetMapping("/NeedClaim/upNewFightNeedProblemClaimEndTime") + public R upNewFightNeedProblemClaimEndTime(); + } \ No newline at end of file -- Gitblit v1.7.1