From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 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 62157a7..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,5 +1,9 @@
 package com.panzhihua.service_community.api;
 
+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;
@@ -9,9 +13,6 @@
 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.*;
-
-import javax.annotation.Resource;
 
 /**
  * @author xyh
@@ -32,78 +33,87 @@
 
     /**
      * 大屏统计邻里圈
+     * 
      * @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  一起议列表
+     * 
+     * @param discussListDTO
+     *            请求参数
+     * @return 一起议列表
      */
     @PostMapping("/getScreenDiscussList")
     public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
@@ -127,11 +137,13 @@
 
     /**
      * 工作大屏-社区动态模块数据统计
-     * @param communityId   社区id
-     * @return  社区动态数据统计
+     * 
+     * @param communityId
+     *            社区id
+     * @return 社区动态数据统计
      */
     @GetMapping("/dynamic")
-    public R dynamic(@RequestParam("communityId")Long communityId){
+    public R dynamic(@RequestParam("communityId") Long communityId) {
         return screenWorkService.dynamicWork(communityId);
     }
 

--
Gitblit v1.7.1