From 3b855b9c20751a5fee840e686988e8e094773a54 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期二, 15 六月 2021 11:02:40 +0800 Subject: [PATCH] bugfixed --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 3 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 3488c73..4d00363 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,9 @@ 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.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; @@ -1189,7 +1192,7 @@ R deleteOpsHouse(@RequestParam("id") Long id); /** - * 一起议-分页查询 + * 房屋租售-分页查询 * * @param pageComOpsHouseDTO 查询参数 * @return ComOpsHouseVO @@ -2193,11 +2196,11 @@ /** * 编辑实有人口 - * @param editComMngPopulationVO + * @param populationEditDTO * @return */ @PostMapping("/common/data/population/edit") - R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId); + R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId); /** * 微心愿删除 @@ -2474,6 +2477,85 @@ @PostMapping("/common/data/population/edit/electronicArchives") R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO); + /** + * 实有人口统计 + * @param communityId 社区id + * @return 统计结果 + */ + @PostMapping("/common/data/population/statistics") + R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId); + + /** + * 查询房屋级联菜单 + * @param cascadeHouseDTO 请求参数 + * @return 菜单列表 + */ + @PostMapping("/common/data/population/cascade/list") + R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO); + + /** + * 分页查询房屋列表 + * @param populationHouseAdminDTO 请求参数 + * @return 房屋列表 + */ + @PostMapping("/common/data/population/page/house") + R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO); + + /** + * 根据id查询实有房屋信息 + * @param houseId 房屋id + * @return 房屋信息 + */ + @PostMapping("/common/data/population/house/detail") + R getHouseDetail(@RequestParam(value = "houseId") Long houseId); + + /** + * 编辑实有房屋信息 + * @param houseEditAdminDTO 请求参数 + * @return 编辑结果 + */ + @PostMapping("/common/data/population/house/edit") + R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO); + + /** + * 根据房屋id列表删除房屋信息 + * @param Ids 请求参数 + * @return 删除结果 + */ + @PostMapping("/common/data/population/house/delete") + R deleteHouses(@RequestBody List<Long> Ids); + + /** + * 实有房屋统计 + * @param communityId 社区id + * @return 统计结果 + */ + @PostMapping("/common/data/population/house/statistics") + R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId); + + /** + * 根据社区id查询社区所有省市区 + * @param communityId 社区id + * @return 社区所在省市区 + */ + @PostMapping("/common/data/village/getRegion") + R getRegion(@RequestParam("communityId") Long communityId); + + /** + * 统计社区内小区数量 + * @param communityId 社区id + * @return 统计小区数量 + */ + @PostMapping("/common/data/village/statistics") + R villageStatistics(@RequestParam("communityId") Long communityId); + + /** + * 小区详情 + * @param villageId 小区id + * @return 小区详情 + */ + @PostMapping("/village/getVillage") + R getVillage(@RequestParam("villageId") Long villageId); /** * 新增高龄认证 @@ -2648,4 +2730,133 @@ */ @PostMapping("/vaccines/admin/enroll/type/list") 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 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); + + /** + * + * @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); } -- Gitblit v1.7.1