From d111b0f70d5930935fc8658e389a1b7b1947f74a Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期二, 26 十月 2021 13:22:27 +0800 Subject: [PATCH] 社工 政策文件开发 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 275 insertions(+), 8 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 4443190..abfe3f6 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 @@ -1,8 +1,29 @@ package com.panzhihua.common.service.community; +import java.io.Serializable; import java.util.List; +import com.panzhihua.common.model.dtos.civil.*; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; +import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO; +import com.panzhihua.common.model.dtos.community.*; +import com.panzhihua.common.model.dtos.community.building.admin.*; +import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; +import com.panzhihua.common.model.dtos.community.cluster.admin.*; +import com.panzhihua.common.model.dtos.property.CommonPage; +import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO; +import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO; +import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO; +import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO; +import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO; +import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO; +import com.panzhihua.common.model.dtos.neighbor.*; +import com.panzhihua.common.model.vos.*; +import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO; +import com.panzhihua.common.model.vos.community.*; +import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO; +import io.swagger.annotations.ApiOperation; +import com.panzhihua.common.model.vos.community.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -225,11 +246,6 @@ import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO; -import com.panzhihua.common.model.vos.BcDictionaryItemVO; -import com.panzhihua.common.model.vos.BcDictionaryVO; -import com.panzhihua.common.model.vos.DictionaryVO; -import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; @@ -2179,7 +2195,7 @@ * @return 新增结果 */ @PostMapping("/addstreet") - R addStreet(@RequestBody ComStreetVO comStreetVOO); + R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO); /** * 删除街道 @@ -2513,12 +2529,12 @@ /** * 批量删除实有人口 * - * @param Ids + * @param ids * 实有人口id集合 * @return 删除结果 */ @PostMapping("/common/data/population/delete") - R deletePopulations(@RequestBody List<Long> Ids); + R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId); /** * 根据社区id查询所有实有人口 @@ -6697,6 +6713,103 @@ public R detailHousesUser(@RequestParam("id") Long id); /** + * 社区后台-分页查询楼栋列表 + * @param pageBuildingListDto 请求参数 + * @return 楼栋列表 + */ + @PostMapping("/building/page/admin/") + R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto); + + /** + * 社区后台-查询楼栋列表表头统计数据 + * @param communityId 社区id + * @return 楼栋列表表头统计数据 + */ + @GetMapping("/building/header/statistics/") + R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId); + + /** + * 社区后台-查询楼栋详情 + * @param id 楼栋id + * @return 楼栋详情 + */ + @GetMapping("/building/detail/admin/") + R detailBuildAdmin(@RequestParam("id") Long id); + + /** + * 查询楼栋下单元列表 + * @param id 楼栋id + * @return 单元列表 + */ + @GetMapping("/building/unit/list/admin") + R buildingUnitListAdmin(@RequestParam("id") Long id); + + /** + * 查询楼栋单元下房屋列表 + * @param unitHouseListDto 请求参数 + * @return 单元列表 + */ + @PostMapping("/building/unit/house/list/admin") + R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto); + + /** + * 查询楼栋单元下房屋详情 + * @param houseId 房屋id + * @param communityId 社区id + * @return 房屋详情 + */ + @GetMapping("/building/unit/house/detail/admin") + R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId); + + /** + * 查询社区下小区列表 + * @param communityId 社区id + * @return 小区列表 + */ + @GetMapping("/building/village/list/admin") + R buildingVillageListAdmin(@RequestParam("communityId") Long communityId); + + /** + * 添加楼栋下单元 + * @param addBuildingUnitDto 请求参数 + * @return 添加结果 + */ + @PostMapping("/building/unit/add/admin") + R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto); + + /** + * 修改楼栋下单元 + * @param editBuildingUnitDto 请求参数 + * @return 修改结果 + */ + @PostMapping("/building/unit/edit/admin") + R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto); + + /** + * 添加户室 + * @param addBuildingHouseDto 请求参数 + * @return 添加结果 + */ + @PostMapping("/building/house/add/admin") + R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto); + + /** + * 修改户室 + * @param editBuildingHouseDto 请求参数 + * @return 修改结果 + */ + @PostMapping("/building/house/edit/admin") + R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto); + + /** + * 删除户室下人员关联信息 + * @param housePopulationDto 请求参数 + * @return 删除结果 + */ + @PostMapping("/building/house/population/delete/admin") + R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto); + + /** * 分页查询所有数据 * * @param commonPage 查询实体 @@ -6864,4 +6977,158 @@ */ @PostMapping("/comActWarehouseDonates/donates/apply") R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO); + + /** + * 实有房屋数据修复定时任务 + * @return 实有房屋数据修复定时任务 + */ + @GetMapping("/population/house/status/task") + R timedTaskHouseJobHandler(); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActColumn/queryAll") + R comActColumnSelectAll(@RequestBody CommonPage commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActColumn/{id}") + R comActColumnSelectOne(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActColumn 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActColumn") + R comActColumnInsert(@RequestBody ComActColumnVO comActColumn); + + /** + * 修改数据 + * + * @param comActColumn 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActColumn/update") + R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActColumn/del") + R comActColumnDelete(@RequestParam("id") Long id); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActSocialOrg/{id}") + R comActSocialOrgSelectOne(@PathVariable("id") Long id); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActSocialMember/queryAll") + public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActSocialMember/{id}") + public R comActSocialMemberSelectOne(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActSocialMember 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActSocialMember") + public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember); + + /** + * 修改数据 + * + * @param comActSocialMember 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActSocialMember/update") + public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActSocialMember/del") + public R comActSocialMemberDelete(@RequestParam("id") Long id); + + /** + * 新增社工 + * @param comActSocialWorkerAddDTO + * @return 新增结果 + */ + @PostMapping("/comactsocialworker/add") + R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO); + + /** + * 修改社工 + * @param comActSocialWorkerEditDTO + * @return 维护结果 + */ + @PostMapping("/comactsocialworker/edit") + R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO); + + /** + * 分页查找社工 + * @param pageComActSocialWorkerDTO + * @return 维护结果 + */ + @PostMapping("/comactsocialworker/page") + R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>> + + /** + * 删除社工 + * @param comActSocialWorkerDeleteDTO + * @return 平台用户信息 + */ + @PostMapping("/comactsocialworker/delete") + R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO); + + /** + * 查询社工详细信息 + * @param id 社工 id + * @return 查找结果 + */ + @PostMapping("/comactsocialworker/{id}") + R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id); + + /** + * 批量导入社工 + * + * @param list 社工集合 + */ + @PostMapping("/comactsocialworker/input") + R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId); } -- Gitblit v1.7.1