From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   62 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 0ededa1..0b657e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9,9 +9,15 @@
 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.dtos.community.bigscreen.event.ScreenEventListDTO;
+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.dtos.elders.ComEldersAuthGetResultDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
 import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -3031,4 +3037,60 @@
      */
     @PostMapping("/screen/getScreenEventDetail")
     R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+    /**
+     * 工作大屏-一起议列表
+     * @param discussListDTO    请求参数
+     * @return  一起议列表
+     */
+    @PostMapping("/screen/work/getScreenDiscussList")
+    R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+    /**
+     * 工作大屏-社区活动列表
+     * @param actActivityListDTO    请求参数
+     * @return  活动列表
+     */
+    @PostMapping("/screen/work/getScreenActActivityList")
+    R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+    /**
+     * 工作大屏-社区活动报名人员列表
+     * @param activityPeopleListDTO 请求参数
+     * @return  社区活动报名人员列表
+     */
+    @PostMapping("/screen/work/getActActivityPeopleList")
+    R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+    /**
+     * 工作大屏-微心愿列表
+     * @param microListDTO  请求参数
+     * @return  微心愿列表
+     */
+    @PostMapping("/screen/work/getScreenMicroList")
+    R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+
+    /**
+     * 获取系统参数接口
+     * @param code  参数code
+     * @return  系统参数
+     */
+    @GetMapping("/sys/conf/get")
+    R getConf(@RequestParam("code") String code);
+
+    /**
+     * 根据社区id获取社区下人口数据信息
+     * @param populationListDTO    请求参数
+     * @return  人口数据
+     */
+    @PostMapping("/population/list/app")
+    R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);
+
+    /**
+     * 根据人口id获取人口详情
+     * @param populationId
+     * @return
+     */
+    @GetMapping("/population/detail/app")
+    R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
 }

--
Gitblit v1.7.1