From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:06 +0800
Subject: [PATCH] 解决代码被合并后删除问题

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 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 6650ff8..62157a7 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,11 +1,15 @@
 package com.panzhihua.service_community.api;
 
+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;
-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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -19,6 +23,12 @@
 
     @Resource
     private ScreenWorkService screenWorkService;
+    @Resource
+    private ComActDiscussService comActDiscussService;
+    @Resource
+    private ComActActivityService comActActivityService;
+    @Resource
+    private ComActMicroWishService comActMicroWishService;
 
     /**
      * 大屏统计邻里圈
@@ -85,7 +95,44 @@
      * @param communityId
      * @return
      */
+    @GetMapping("/workCount")
     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