From 7d9fbfdc05485c8e2cb457dffb1fd29580dfb41b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 16:02:15 +0800
Subject: [PATCH] Merge branch 'bigscreen_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 179 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 a117c42..b7916f3 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
@@ -3,6 +3,9 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.service.ComActService;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.service_community.service.BigScreenStatisticsService;
+import com.panzhihua.service_community.service.BigScreenService;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
@@ -21,6 +24,10 @@
private ComMngPopulationService comMngPopulationService;
@Resource
private ComActService comActService;
+ @Resource
+ private BigScreenService bigScreenService;
+ @Resource
+ private BigScreenStatisticsService bigScreenStatisticsService;
/**
* 首页大屏统计接口
@@ -105,4 +112,176 @@
public R getCommunityPassword(@RequestParam("communityId") Long communityId){
return comActService.getCommunityPassword(communityId);
}
+ /**
+ * 新版大屏首页接口
+ */
+ @GetMapping("/indexInfo")
+ public R indexInfo(@RequestParam("communityId") Long communityId){
+ return comMngPopulationService.indexInfo(communityId);
+ }
+
+ /**
+ * 首页二级页面-微心愿
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/microWish")
+ public R indexMicroWish(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexMicroWish(communityId);
+ }
+
+ /**
+ * 首页二级页面-随手拍
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/easyPhoto")
+ public R indexEasyPhoto(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexEasyPhoto(communityId);
+ }
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ * @param communityId
+ * @param classifyId
+ * @return
+ */
+ @GetMapping("/index/easyPhotoList")
+ public R indexEasyPhotoList(@RequestParam("communityId") Long communityId,
+ @RequestParam(value = "classifyId", required = false) Long classifyId) {
+ return bigScreenStatisticsService.indexEasyPhotoList(communityId, classifyId);
+ }
+
+ /**
+ * 首页二级页面-社区问卷
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/questionnaire")
+ public R indexQuestionnaire(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexQuestionnaire(communityId);
+ }
+
+ /**
+ * 首页二级页面-社区动态
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/dyn")
+ public R indexDyn(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexDyn(communityId);
+ }
+
+ /**
+ * 首页二级页面-社区动态展示列表
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @GetMapping("/index/dynList")
+ public R indexDynList(@RequestParam("communityId") Long communityId,
+ @RequestParam(value = "type", required = false) Long type) {
+ return bigScreenStatisticsService.indexDynList(communityId, type);
+ }
+
+ /**
+ * 首页二级页面-邻里圈
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/neighbor")
+ public R indexNeighbor(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexNeighbor(communityId);
+ }
+
+ /**
+ * 首页二级页面-邻里圈展示列表
+ * @param communityId
+ * @param topicId
+ * @return
+ */
+ @GetMapping("/index/neighborList")
+ public R indexNeighborList(@RequestParam("communityId") Long communityId,
+ @RequestParam(value = "topicId", required = false) Long topicId) {
+ return bigScreenStatisticsService.indexNeighborList(communityId, topicId);
+ }
+
+ /**
+ * 首页二级页面-便民商家
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/merchant")
+ public R indexMerchant(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexMerchant(communityId);
+ }
+
+ /**
+ * 首页二级页面-商家展示列表
+ * @param communityId
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/index/merchantList")
+ public R indexMerchantList(@RequestParam("communityId") Long communityId,
+ @RequestParam(value = "categoryId", required = false) Long categoryId) {
+ return bigScreenStatisticsService.indexMerchantList(communityId, categoryId);
+ }
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @GetMapping("/serviceData")
+ public R serviceData(@RequestParam("communityId")Long communityId){
+ return this.bigScreenService.serviceData(communityId);
+ }
+
+ /**
+ * 服务居民接口
+ */
+ @GetMapping("/serviceUser")
+ public R serviceUser(@RequestParam("communityId") Long communityId){
+ return this.bigScreenService.serviceUser(communityId);
+ }
+
+ /**
+ * 大数据分析平台-居民自治
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/resident/autonomy")
+ public R getResidentAutonomy(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getResidentAutonomy(communityId);
+ }
+
+ /**
+ * 大数据分析平台-清网治格
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/grids/governance")
+ public R getGridsGovernance(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getGridsGovernance(communityId);
+ }
+
+ /**
+ * 大数据分析平台-社区服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/community/service")
+ public R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getCommunityServiceStatistics(communityId);
+ }
+
+ /**
+ * 分页获取热度排行商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/merchant/popular")
+ public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
+ return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
+ }
+
}
--
Gitblit v1.7.1