From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 307 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 6d79a47..ed5a867 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
@@ -5,6 +5,18 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+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.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -19,6 +31,10 @@
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
+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;
@@ -31,7 +47,6 @@
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.*;
@@ -2728,7 +2743,48 @@
R getEnrollTypeListByAdmin();
/**
- * 批量保存楼栋
+ * 查询老龄认证记录
+ * @param pageComEldersRecordsDTO
+ * @return
+ */
+ @PostMapping("/elders/records")
+ R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);
+
+ /**
+ * 查询老龄认证记录详细
+ * @param id
+ * @return
+ */
+ @PostMapping("/elders/records/deatils")
+ R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);
+
+ /**
+ * 查询老龄认证社区认证方式
+ * @param eldersAuthTypeQueryDTO
+ * @return
+ */
+ @PostMapping("/elders/authtype")
+ R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 分页查询高领老人列表
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/page")
+ R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * 批量保存高龄老人
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/batchSave")
+ R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);
+
+ /**
+ * 批量保存楼栋
* @param newVoList
* @param communityId
* @return
@@ -2743,8 +2799,78 @@
*/
@GetMapping("/dictionary/listDictionaryByKey")
R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
- // R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("streetId")Long streetId);
+ /**
+ * 查看高龄老人详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/eldersauthelderly/{id}")
+ R getEldersAuthElderlyById(@PathVariable("id") Long id);
+ /**
+ * 修改高龄老人信息
+ * @param eldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/update")
+ R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);
+
+ /**
+ * 删除高领老人
+ * @param id
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/delete")
+ R deleteEldersAuthElderly(@RequestParam("id") Long id);
+
+ /**
+ * 通过老人用户id获取老人信息
+ * @param authUserId 老人用户id
+ * @return 老人信息
+ */
+ @PostMapping("/elders/getAuth")
+ R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);
+
+ /**
+ * 人脸核验新增高龄认证记录
+ * @param authGetResultDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/elders/add/auth")
+ R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);
+
+ /**
+ * 高龄认证分页接口
+ * @param authPageDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/elders/page/auth")
+ R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);
+
+ /**
+ * 添加高龄老人接口
+ * @param authUserAddAppDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/elders/add")
+ R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 修改高龄老人接口
+ * @param authUserAddAppDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/elders/edit")
+ R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+
+ /**
+ * 分页查询生存认证记录
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/elders/records/page")
+ R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
/**
* description 批量保存重点人群人员信息
*
@@ -2753,10 +2879,138 @@
* @author manailin
* @date 2021/6/10 17:00
*/
- @PostMapping("/key_person/batch/save")
+ @PostMapping("/key_person/batch/save")
R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
+ @GetMapping("/screen/population/statistic")
+ R statistic(@RequestParam("communityId")Long communityId);
+
/**
+ *
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @PostMapping("/elders/setCommunityAuthType")
+ R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type);
+
+ @PostMapping("/elders/getAuthHistoryList")
+ R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @PostMapping("/elders/getAuthHistoryExport")
+ R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @GetMapping("/screen/work/neighborCircle")
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
+
+
+ /**
+ * 党员党支部统计信息
+ * @return
+ */
+ @PostMapping("/bigscreen/party/orgmembers")
+ R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 党员年龄占比、男女占比
+ * @return
+ */
+ @PostMapping("/bigscreen/party/ageGender")
+ R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+
+ /**
+ * 党建数据概览
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partybuild/{communityId}")
+ R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动参加用户排行榜-TOP3
+ * @return
+ */
+ @PostMapping("/bigscreen/party/activitytopuser/{communityId}")
+ R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动
+ * @return
+ */
+ @PostMapping("/bigscreen/party/bigscreenPartyactivity")
+ R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+ /**
+ * 首页大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenIndex")
+ R getScreenIndex(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 事件大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 民生大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @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);
+
+ /**
* description 批量保存残疾人人员信息
*
* @param list 疾人信息列表
@@ -2766,4 +3020,53 @@
*/
@PostMapping("/disable_person/batch/save")
R saveBatchDisabledPersons(@RequestBody List<DisabledPersonsDTO> list);
+
+ /**
+ * 获取社区网格
+ * @param communityId 社区id
+ * @return 网格数据
+ */
+ @GetMapping("/screen/getScreenGirds")
+ R getScreenGirds(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 事件大屏查询事件详情
+ * @param eventDetailDTO 请求参数
+ * @return 事件详情
+ */
+ @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);
+
}
--
Gitblit v1.7.1