From 0fe3549fb6a01ccdc03672d6570b4a11ecf668eb Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:38:16 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java | 104 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 40 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 aba4278..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,12 +1,18 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_community.service.ComActDiscussService;
-import com.panzhihua.service_community.service.ScreenWorkService;
+import javax.annotation.Resource;
+
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+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
@@ -20,107 +26,125 @@
private ScreenWorkService screenWorkService;
@Resource
private ComActDiscussService comActDiscussService;
+ @Resource
+ private ComActActivityService comActActivityService;
+ @Resource
+ private ComActMicroWishService comActMicroWishService;
/**
- *
* 大屏统计邻里圈
- * 状态-显示(2)
- * 本月新增-显示(2)
+ *
* @param communityId
* @return
*/
@GetMapping("/neighborCircle")
- R statisticNeighborCircle(@RequestParam("communityId") Long communityId){
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId) {
return screenWorkService.statisticNeighborCircle(communityId);
}
/**
- * 大屏统计心愿单，
- * 累计实现-已完成（6）
- * 等待实现-非已完成(1、2、3、4、5)
- * 本月新增-所有状态(1、2、3、4、5、6)
+ * 大屏统计心愿单
+ *
* @param communityId
* @return
*/
@GetMapping("/wish")
- R wish(@RequestParam("communityId") Long communityId){
+ R wish(@RequestParam("communityId") Long communityId) {
return screenWorkService.wish(communityId);
}
/**
* 大屏统计社区活动
- * 状态：报名中（3）、进行中（4）、已结束（5）
- * 本月新增：报名中（3）、进行中（4）、已结束（5）
- * 志愿者活动-参与者人数上限为0
- * 居民活动-参与者人数上限>0
+ *
* @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);
}
/**
- * 大屏统计党建工作
- * 党员活动：报名中（3）、进行中（4）、已结束（5）
- * 党员宣传（党员动态）：
+ * 大屏统计党建工作
+ *
* @param communityId
* @return
*/
@GetMapping("/pbWork")
- R pbWork(@RequestParam("communityId")Long communityId){
+ R pbWork(@RequestParam("communityId") Long communityId) {
return screenWorkService.pbWork(communityId);
}
/**
* 大屏统计随手拍
- * 新增的-所有状态
- * 已处理-3已驳回 4已完成
- * 已公示-4已完成
- * 未公示-3已驳回
- * 未处理-1待审核
- * 公示比例-已公示/(已公示+已驳回)
- * 平均耗时-创建时间至反馈时间(已完成状态)
- * 线形图-随手拍数量-累计
- * 线形图-新增随手拍-时间段新增
- * 线形图-处理随手拍-时间段（已驳回和已完成）
+ *
* @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 一起议列表
+ *
+ * @param discussListDTO
+ * 请求参数
+ * @return 一起议列表
*/
@PostMapping("/getScreenDiscussList")
public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
- return R.ok(comActDiscussService.getScreenDiscussList(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