Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java

@@ -3,6 +3,9 @@
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
@@ -66,6 +69,18 @@
    @PostMapping("listvillage")
    public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
        R r = comMngVillageService.listComActVillage(comMngVillageVO);
        return R.ok(r);
    }

    /**
     * 根据房屋id查询实有房屋
     *
     * @param villageId 查询条件
     * @return 查询结果
     */
    @PostMapping("getVillageById")
    public R getVillageById(@RequestParam(value = "villageId")Long villageId){
        R r = comMngVillageService.getVillageById(villageId);
        return R.ok(r);
    }

@@ -186,5 +201,30 @@
        return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);
    }

    @PostMapping("/village/admin/del")
    public R delGridVillage(@RequestBody List<Long> villageIds) {
        return comMngVillageService.delGridVillage(villageIds);
    }

    @PostMapping("/village/admin/population/list")
    public R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO) {
        return comMngPopulationService.getVillagePopulationAdmin(villagePopulationDTO);
    }

    @PostMapping("/village/admin/population/house/list")
    public R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO) {
        return comMngPopulationHouseUserService.getVillagePopulationHouseAdmin(villagePopulationHouseDTO);
    }

    @GetMapping("/village/admin/statistics")
    public R getGridVillageStatistics() {
        return comMngVillageService.getGridVillageStatistics();
    }

    @PostMapping("/village/admin/export")
    public R getGridPopulationAdminListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO) {
        return comMngVillageService.getGridVillageListExport(villageListAppDTO);
    }


}