From 9c5b811fb700bc66e66dbf38ed8733e57a4edac6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:19:14 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 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 8ae1dae..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
@@ -2,6 +2,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.service_community.service.ComActService;
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
@@ -335,4 +336,41 @@
     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);
+    }
+    @GetMapping("/hmk/partyProjectActivityLine")
+    public R partyActivityLine(){
+        return bigScreenStatisticsService.partyProjectActivityLine();
+    }
+    @PostMapping("/hmk/projectActivityTop")
+    public R projectActivityTop(@RequestBody CommonPage commonPage){
+        return bigScreenStatisticsService.projectActivityProject(commonPage);
+    }
+    @GetMapping("/hmk/projectType")
+    public R projectType(@RequestParam("name") String name){
+        return bigScreenStatisticsService.projectType(name);
+    }
 }

--
Gitblit v1.7.1