From 8f6a6c3245fa8e3315695f91346c496f9c31c010 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 10 六月 2021 17:57:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |  100 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index bf3e358..267b642 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -39,6 +39,10 @@
     private ComMngProvinceService comMngProvinceService;
     @Resource
     private ComMngPopulationService comMngPopulationService;
+    @Resource
+    private ComMngPopulationHouseService comMngPopulationHouseService;
+    @Resource
+    private ComMngVillageService comMngVillageService;
 
 
     /**
@@ -354,12 +358,12 @@
 
     /**
      * 编辑实有人口
-     * @param editComMngPopulationVO
+     * @param populationEditDTO
      * @return
      */
     @PostMapping("/population/edit")
-    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
-        return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
+    R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,@RequestParam("communityId") Long communityId) throws Exception{
+        return comMngPopulationService.editPopulation(populationEditDTO, communityId);
     }
 
     /**
@@ -392,4 +396,94 @@
         return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
     }
 
+    /**
+     * 实有人口统计
+     * @param communityId   社区id
+     * @return  统计结果
+     */
+    @PostMapping("/population/statistics")
+    public R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId) {
+        return comMngPopulationService.getPopulationTotalByAdmin(communityId);
+    }
+
+    /**
+     * 查询房屋级联菜单
+     * @param cascadeHouseDTO   请求参数
+     * @return  菜单列表
+     */
+    @PostMapping("/population/cascade/list")
+    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO){
+        return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
+    }
+
+    /**
+     * 分页查询房屋列表
+     * @param populationHouseAdminDTO   请求参数
+     * @return  房屋列表
+     */
+    @PostMapping("/population/page/house")
+    public R getPageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO){
+        return comMngPopulationHouseService.getPageHouse(populationHouseAdminDTO);
+    }
+
+    /**
+     * 根据id查询实有房屋信息
+     * @param houseId   房屋id
+     * @return  房屋信息
+     */
+    @PostMapping("/population/house/detail")
+    public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
+        return comMngPopulationHouseService.getHouseDetail(houseId);
+    }
+
+    /**
+     * 编辑实有房屋信息
+     * @param houseEditAdminDTO 请求参数
+     * @return  编辑结果
+     */
+    @PostMapping("/population/house/edit")
+    public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
+        return comMngPopulationHouseService.editHouse(houseEditAdminDTO);
+    }
+
+    /**
+     * 根据房屋id列表删除房屋信息
+     * @param Ids   请求参数
+     * @return  删除结果
+     */
+    @PostMapping("/population/house/delete")
+    public R deleteHouses(@RequestBody List<Long> Ids){
+        return comMngPopulationHouseService.deleteHouses(Ids);
+    }
+
+    /**
+     * 实有房屋统计
+     * @param communityId   社区id
+     * @return  统计结果
+     */
+    @PostMapping("/population/house/statistics")
+    public R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId) {
+        return comMngPopulationHouseService.getHouseTotalByAdmin(communityId);
+    }
+
+    /**
+     * 根据社区id查询社区所有省市区
+     * @param communityId   社区id
+     * @return  社区所在省市区
+     */
+    @PostMapping("/village/getRegion")
+    public R getRegion(@RequestParam("communityId") Long communityId) {
+        return comMngPopulationHouseService.getRegion(communityId);
+    }
+
+    /**
+     * 统计社区内小区数量
+     * @param communityId   社区id
+     * @return  统计小区数量
+     */
+    @PostMapping("/village/statistics")
+    public R villageStatistics(@RequestParam("communityId") Long communityId) {
+        return comMngVillageService.villageStatistics(communityId);
+    }
+
 }

--
Gitblit v1.7.1