From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index e3ab226..b87abfb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -297,6 +297,66 @@
return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
}
+ /**
+ * 首页二级页面-居民活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/residentAct")
+ public R indexResidentAct(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexResidentAct(communityId);
+ }
+
+ /**
+ * 首页二级页面-居民活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/residentActList")
+ public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexResidentActList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-志愿者活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/volunteerAct")
+ public R indexVolunteerAct(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexVolunteerAct(communityId);
+ }
+
+ /**
+ * 首页二级页面-志愿者活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/volunteerActList")
+ public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO);
+ }
+
+ /**
+ * 清网治格-根据事件分类获取近1月的社区事件数据
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/event/list")
+ public R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId) {
+ return bigScreenStatisticsService.getEventList(type, communityId);
+ }
+
+ /**
+ * 清网治格-社区事件数据分页
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/event/page")
+ public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageEventList(pageBaseDTO);
+ }
@PostMapping("/hmk/baseInfo")
public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
return bigScreenStatisticsService.hmkBaseInfo(commonPage);
--
Gitblit v1.7.1