From 92ad195603db4b075d0ad1d7cf7471b15f2cc126 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 18 十月 2021 18:01:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   86 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 5 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 1ad6f35..fb97e74 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
@@ -4,6 +4,8 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +48,8 @@
     private ComMngPopulationHouseService comMngPopulationHouseService;
     @Resource
     private ComMngVillageService comMngVillageService;
+    @Resource
+    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
 
     /**
      * 小程序用户车辆登记
@@ -603,13 +607,13 @@
     /**
      * 批量删除实有人口
      *
-     * @param Ids
+     * @param ids
      *            删除id集合
      * @return 删除结果
      */
     @PostMapping("/population/delete")
-    public R deletePopulations(@RequestBody List<Long> Ids) {
-        return comMngPopulationService.deletePopulations(Ids);
+    public R deletePopulations(@RequestBody List<Long> ids, Long communityId) {
+        return comMngPopulationService.deletePopulations(ids,communityId);
     }
 
     /**
@@ -680,8 +684,8 @@
      * @return 删除结果
      */
     @PostMapping("/special/delete")
-    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
-        return comMngPopulationService.deleteSpecialInputUser(id);
+    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam(value = "communityId") Long communityId) {
+        return comMngPopulationService.deleteSpecialInputUser(id,communityId);
     }
 
     /**
@@ -764,6 +768,18 @@
     }
 
     /**
+     * 查询房屋二级级联菜单后台
+     *
+     * @param cascadeHouseDTO
+     *            请求参数
+     * @return 菜单列表
+     */
+    @PostMapping("/population/second/listBack")
+    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+        return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
+    }
+
+    /**
      * 分页查询房屋列表
      *
      * @param populationHouseAdminDTO
@@ -797,6 +813,18 @@
     @PostMapping("/population/house/edit")
     public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
         return comMngPopulationHouseService.editHouse(houseEditAdminDTO);
+    }
+
+    /**
+     * 新增实有房屋信息
+     *
+     * @param houseEditAdminDTO
+     *            请求参数
+     * @return 编辑结果
+     */
+    @PostMapping("/population/house/insert")
+    public R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO) {
+        return comMngPopulationHouseService.insertHouse(houseEditAdminDTO);
     }
 
     /**
@@ -846,4 +874,52 @@
     public R villageStatistics(@RequestParam("communityId") Long communityId) {
         return comMngVillageService.villageStatistics(communityId);
     }
+
+    /**
+     * 编辑实有房屋信息
+     *
+     * @param comMngPopulationHouseUserVO
+     *            请求参数
+     * @return 编辑结果
+     */
+    @PostMapping("/population/house/user/edit")
+    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+        return comMngPopulationHouseUserService.updateAll(comMngPopulationHouseUserVO);
+    }
+
+    /**
+     * 新增实有房屋信息
+     *
+     * @param comMngPopulationHouseUserVO
+     *            请求参数
+     * @return 编辑结果
+     */
+    @PostMapping("/population/house/user/insert")
+    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+        return comMngPopulationHouseUserService.insert(comMngPopulationHouseUserVO);
+    }
+
+    /**
+     * 根据房屋id列表删除房屋信息
+     *
+     * @param comMngPopulationHouseUserVO
+     *            请求参数
+     * @return 删除结果
+     */
+    @PostMapping("/population/house/user/delete")
+    public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+        return comMngPopulationHouseUserService.delete(comMngPopulationHouseUserVO);
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     *            请求参数
+     * @return 删除结果
+     */
+    @GetMapping("/population/house/user/detail")
+    public R detailHousesUser(@RequestParam("id") Long id) {
+        return comMngPopulationHouseUserService.detail(id);
+    }
 }

--
Gitblit v1.7.1