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/BigScreenApi.java |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java
index 1f62f0b..aefd3eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java
@@ -1,23 +1,23 @@
 package com.panzhihua.service_community.api;
 
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.bigscreen.*;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
-import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
-import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
 import com.panzhihua.service_community.service.BigScreenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @ClasssName BigScreenApi
@@ -36,49 +36,53 @@
 
     /**
      * 党员党支部统计信息
+     * 
      * @return
      */
     @PostMapping("/orgmembers")
-    R orgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
+    R orgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
         return bigScreenService.partyOrgMembers(pageBigScreenStatisticPartyOrg);
     }
 
-
     /**
-     *  党员年龄占比、男女占比
+     * 党员年龄占比、男女占比
+     * 
      * @return
      */
     @PostMapping("/ageGender")
-    R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO){
+    R<BigScreenStatisticAgeGender>
+        ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO) {
         return bigScreenService.ageGender(bigScreenStatisticAgeGenderDTO);
     }
 
-
     /**
-     *  党建数据概览
+     * 党建数据概览
+     * 
      * @return
      */
     @PostMapping("/partybuild/{communityId}")
-    R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId){
+    R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId) {
         return bigScreenService.bigscreenPartybuild(communityId);
     }
 
     /**
      * 党员活动参加用户排行榜-TOP3
+     * 
      * @return
      */
     @PostMapping("/activitytopuser/{communityId}")
-    R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId){
+    R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId) {
         return bigScreenService.bigscreenPartyactivitytopuser(communityId);
     }
 
-
     /**
      * 党员活动
+     * 
      * @return
      */
     @PostMapping("/bigscreenPartyactivity")
-    R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(@RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO){
+    R<List<BigScreenStatisticPartyActivity>>
+        bigscreenPartyactivity(@RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
         return bigScreenService.bigscreenPartyactivity(bigScreenStatisticPartyActivityDTO);
     }
 }

--
Gitblit v1.7.1