From 62c8ce18992be21e88d29a4357a14555150c0b48 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 19:08:34 +0800
Subject: [PATCH] 合并一标三实代码

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   82 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 78 insertions(+), 4 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 1b57b5c..d2f6b49 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
@@ -23,11 +23,12 @@
 import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.dtos.vaccines.*;
-import com.panzhihua.common.model.vos.IPageVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.community.bigscreen.*;
+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.common.model.vos.community.questnaire.EditComActQuestnaireVo;
 import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
 import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
@@ -40,6 +41,7 @@
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.utlis.ExcelSelectObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -2776,6 +2778,22 @@
     @PostMapping("/eldersauthelderly/batchSave")
     R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);
 
+	/**
+	     *  批量保存楼栋
+     * @param newVoList
+     * @param communityId
+     * @return
+     */
+    @PostMapping("/building/batchSave")
+    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId);
+
+    /**
+     * 根据字典key查询字典项
+     * @param key
+     * @return
+     */
+    @GetMapping("/dictionary/listDictionaryByKey")
+    R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
     /**
      * 查看高龄老人详情
      * @param id
@@ -2848,6 +2866,12 @@
      */
     @PostMapping("/elders/records/page")
     R pageQueryEldersAuthRecord(@RequestBody  PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
+	
+	@PostMapping("/key_person/batch/save")
+    R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
+	
+	@GetMapping("/screen/population/statistic")
+    R statistic(@RequestParam("communityId")Long communityId);
 
     /**
      *
@@ -2863,6 +2887,9 @@
 
     @PostMapping("/elders/getAuthHistoryExport")
     R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+	
+	@GetMapping("/screen/work/neighborCircle")
+    R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
 
 
     /**
@@ -2923,4 +2950,51 @@
      */
     @GetMapping("/screen/getScreenCivil")
     R getScreenCivil(@RequestParam("communityId")Long communityId);
+	
+	/**
+     * 大屏统计邻里圈
+     */
+    @GetMapping("/screen/work/wish")
+    R wish(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大屏统计社区-活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/work/activity")
+    R activity(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大屏统计一起议
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/work/discuss")
+    R discuss(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 大屏统计党建工作
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/work/pbWork")
+    R pbWork(@RequestParam("communityId")Long communityId);
+
+
+    /**
+     * 大屏统计随手拍
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/work/easyPhoto")
+    R easyPhoto(@RequestParam("communityId")Long communityId);
+
+    /**
+     *  大屏统计工作情况
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/work/workCount")
+    R workCount(@RequestParam("communityId")Long communityId);
 }

--
Gitblit v1.7.1