From 5a8a90c095280fbd2106869ecd2bad10e01a57a6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 18:10:22 +0800
Subject: [PATCH] 12/23 大屏修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java | 88 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
index f6497ff..fd853a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
@@ -1,13 +1,18 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_community.service.ScreenWorkService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComActActivityService;
+import com.panzhihua.service_community.service.ComActDiscussService;
+import com.panzhihua.service_community.service.ComActMicroWishService;
+import com.panzhihua.service_community.service.ScreenWorkService;
/**
* @author xyh
@@ -19,74 +24,127 @@
@Resource
private ScreenWorkService screenWorkService;
+ @Resource
+ private ComActDiscussService comActDiscussService;
+ @Resource
+ private ComActActivityService comActActivityService;
+ @Resource
+ private ComActMicroWishService comActMicroWishService;
/**
* 大屏统计邻里圈
+ *
* @param communityId
* @return
*/
@GetMapping("/neighborCircle")
- R statisticNeighborCircle(@RequestParam("communityId") Long communityId){
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId) {
return screenWorkService.statisticNeighborCircle(communityId);
}
/**
* 大屏统计心愿单
+ *
* @param communityId
* @return
*/
@GetMapping("/wish")
- R wish(@RequestParam("communityId") Long communityId){
+ R wish(@RequestParam("communityId") Long communityId) {
return screenWorkService.wish(communityId);
}
/**
* 大屏统计社区活动
+ *
* @param communityId
* @return
*/
@GetMapping("/activity")
- R activity(@RequestParam("communityId") Long communityId){
+ R activity(@RequestParam("communityId") Long communityId) {
return screenWorkService.activity(communityId);
}
/**
* 大屏统计一起议
+ *
* @param communityId
* @return
*/
@GetMapping("/discuss")
- R discuss(@RequestParam("communityId") Long communityId){
+ R discuss(@RequestParam("communityId") Long communityId) {
return screenWorkService.discuss(communityId);
}
/**
- * 大屏统计党建工作
+ * 大屏统计党建工作
+ *
* @param communityId
* @return
*/
@GetMapping("/pbWork")
- R pbWork(@RequestParam("communityId")Long communityId){
+ R pbWork(@RequestParam("communityId") Long communityId) {
return screenWorkService.pbWork(communityId);
}
/**
* 大屏统计随手拍
+ *
* @param communityId
* @return
*/
@GetMapping("/easyPhoto")
- R easyPhoto(@RequestParam("communityId")Long communityId){
+ R easyPhoto(@RequestParam("communityId") Long communityId) {
return screenWorkService.easyPhoto(communityId);
}
/**
* 大屏统计工作情况
+ *
* @param communityId
* @return
*/
@GetMapping("/workCount")
- R workCount(@RequestParam("communityId")Long communityId){
+ R workCount(@RequestParam("communityId") Long communityId) {
return screenWorkService.workCount(communityId);
}
+
+ /**
+ * 工作大屏-一起议列表
+ *
+ * @param discussListDTO
+ * 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/getScreenDiscussList")
+ public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
+ return comActDiscussService.getScreenDiscussList(discussListDTO);
+ }
+
+ @PostMapping("/getScreenActActivityList")
+ public R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) {
+ return comActActivityService.getScreenActActivityList(actActivityListDTO);
+ }
+
+ @PostMapping("/getActActivityPeopleList")
+ public R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) {
+ return comActActivityService.getActActivityPeopleList(activityPeopleListDTO);
+ }
+
+ @PostMapping("/getScreenMicroList")
+ public R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO) {
+ return comActMicroWishService.getScreenMicroList(microListDTO);
+ }
+
+ /**
+ * 工作大屏-社区动态模块数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区动态数据统计
+ */
+ @GetMapping("/dynamic")
+ public R dynamic(@RequestParam("communityId") Long communityId) {
+ return screenWorkService.dynamicWork(communityId);
+ }
+
}
--
Gitblit v1.7.1