Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -19,7 +19,7 @@
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.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
@@ -3150,4 +3150,76 @@
     */
    @PostMapping("/population/grid/list")
    R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     */
    @PostMapping("/population/grid/del")
    R delGridPopulation(@RequestBody List<Long> ids);

    /**
     * 综治后台-居民详情
     * @param populationId  居民id
     * @return  居民详情
     */
    @GetMapping("/population/grid/get")
    R getGridPopulationDetail(@RequestParam("populationId")Long populationId);

    /**
     * 综治app-小区列表
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @PostMapping("/village/grid/list")
    R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);

    /**
     * 综治app-根据小区id查询小区下楼栋列表
     * @param villageId 小区id
     * @return  楼栋列表
     */
    @PostMapping("/village/grid/building/list")
    R getGridVillageBuildingList(@RequestParam("villageId")Long villageId);

    /**
     * 小区楼栋下房屋列表
     * @param buildHouseAppDTO  请求参数
     * @return  房屋列表
     */
    @PostMapping("/village/grid/building/house/list")
    R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);

    /**
     * 小区楼栋下房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @PostMapping("/village/grid/building/house/detail")
    R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId);

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    @PostMapping("/village/grid/building/house/population/list")
    R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);

    /**
     * 批量向房屋新增人员
     * @param housePopulationDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("/village/grid/building/house/add/population")
    R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);

    /**
     * 批量删除房屋内人员
     * @param housePopulationDTO    请求参数
     * @return  删除结果
     */
    @PostMapping("/village/grid/building/house/del/population")
    R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
}