From c780b377576f39c0a15e7d58e25fdacb0a379f18 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 18:10:46 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java |   78 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 4721989..4050c0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -1,9 +1,14 @@
 package com.panzhihua.service_community.api;
 
 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.vos.R;
 import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.service_community.service.ComMngPopulationHouseService;
+import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
+import com.panzhihua.service_community.service.ComMngPopulationService;
 import com.panzhihua.service_community.service.ComMngVillageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +28,12 @@
 public class ComMngVillageApi {
     @Resource
     private ComMngVillageService comMngVillageService;
+    @Resource
+    private ComMngPopulationHouseService comMngPopulationHouseService;
+    @Resource
+    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+    @Resource
+    private ComMngPopulationService comMngPopulationService;
 
     /**
      * 新增实有房屋
@@ -94,4 +105,71 @@
     public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
         return comMngVillageService.editVillage(villageId,comMngVillageVO);
     }
+
+    /**
+     * 小区详情
+     * @param villageId 小区id
+     * @return  小区详情
+     */
+    @PostMapping("/village/getVillage")
+    public R getVillage(@RequestParam("villageId") Long villageId) {
+        return comMngVillageService.getVillage(villageId);
+    }
+
+    /**
+     * 综治app-小区列表
+     * @param villageListAppDTO 请求参数
+     * @return  小区列表
+     */
+    @PostMapping("/village/grid/list")
+    public R getGridPopulationAdminList(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
+        return comMngVillageService.getGridVillageList(villageListAppDTO);
+    }
+
+    /**
+     * 综治app-根据小区id查询小区下楼栋列表
+     * @param villageId 小区id
+     * @return  楼栋列表
+     */
+    @PostMapping("/village/grid/building/list")
+    public R getGridVillageBuildingList(@RequestParam("villageId")Long villageId) {
+        return comMngVillageService.getGridVillageBuildingList(villageId);
+    }
+
+    /**
+     * 小区楼栋下房屋列表
+     * @param buildHouseAppDTO  请求参数
+     * @return  房屋列表
+     */
+    @PostMapping("/village/grid/building/house/list")
+    public R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO) {
+        return comMngPopulationHouseService.getGridVillageBuildingHouseList(buildHouseAppDTO);
+    }
+
+    /**
+     * 小区楼栋下房屋信息
+     * @param houseId   房屋id
+     * @return  房屋信息
+     */
+    @PostMapping("/village/grid/building/house/detail")
+    public R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId) {
+        return comMngPopulationHouseService.getGridVillageBuildingHouseDetail(houseId);
+    }
+
+    @PostMapping("/village/grid/building/house/population/list")
+    public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
+        return comMngPopulationService.getBuildingHousePopulationList(populationDTO);
+    }
+
+    @PostMapping("/village/grid/building/house/add/population")
+    public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
+        return comMngPopulationHouseUserService.addBuildingHousePopulation(housePopulationDTO);
+    }
+
+    @PostMapping("/village/grid/building/house/del/population")
+    public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
+        return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);
+    }
+
+
 }

--
Gitblit v1.7.1