From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 15 十月 2021 16:25:01 +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 | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 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 4443190..7d413e0 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 @@ -3,6 +3,23 @@ import java.util.List; 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.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; @@ -6697,6 +6714,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 查询实体 -- Gitblit v1.7.1