From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15: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/PopulationApi.java |   98 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
index d14c72d..3594586 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
@@ -1,13 +1,19 @@
 package com.panzhihua.service_community.api;
 
 import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComMngPopulationHouseService;
 import com.panzhihua.service_community.service.ComMngPopulationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -16,22 +22,114 @@
 
     @Resource
     private ComMngPopulationService comMngPopulationService;
+    @Resource
+    private ComMngPopulationHouseService comMngPopulationHouseService;
 
+    /**
+     * 获取人口数据信息
+     *
+     * @param populationListDTO 请求参数
+     * @return 人口数据
+     */
     @PostMapping("/list/app")
     public R pagePopulationList(@RequestBody PagePopulationListDTO populationListDTO) {
         return comMngPopulationService.pagePopulationListApp(populationListDTO);
     }
 
+    /**
+     * 根据人口id获取人口详情
+     *
+     * @param populationId  人口id
+     * @return  人口详情
+     */
     @GetMapping("/detail/app")
     public R getPopulationDetail(@RequestParam("populationId") Long populationId) {
         return comMngPopulationService.getPopulationDetailApp(populationId);
     }
 
+    /**
+     * 修复人口加密问题
+     *
+     * @return 修复结果
+     */
     @GetMapping("/repair")
     public R repair() {
         return comMngPopulationService.getPopulationRepairByApp();
     }
 
+    /**
+     * 综治后台-居民列表
+     * @param populationListDTO 请求参数
+     * @return  居民列表
+     */
+    @PostMapping("/grid/list")
+    public R getGridPopulationAdminList(@RequestBody ComMngPopulationListDTO populationListDTO) {
+        return comMngPopulationService.getGridPopulationAdminList(populationListDTO);
+    }
+
+    /**
+     * 综治后台-删除居民
+     * @param ids   居民id集合
+     * @return  删除结果
+     */
+    @PostMapping("/grid/del")
+    public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
+        return comMngPopulationService.delGridPopulationAdmin(ids);
+    }
+
+    /**
+     * 综治后台-居民详情
+     * @param populationId  居民id
+     * @return  居民详情
+     */
+    @GetMapping("/grid/get")
+    public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
+        return comMngPopulationService.getPopulationDetailApp(populationId);
+    }
+
+    @GetMapping("/binding")
+    public R binding() {
+        return comMngPopulationService.binding();
+    }
+
+    /**
+     * 综治后台-居民标签栏统计
+     * @return  居民统计
+     */
+    @GetMapping("/grid/statistics")
+    public R getGridPopulationStatistics(@RequestParam("communityId") Long communityId) {
+        return comMngPopulationService.getGridPopulationStatistics(communityId);
+    }
+
+    /**
+     * 综治后台-居民导出查询居民数据
+     * @param populationExportDTO   请求参数
+     * @return  导出结果
+     */
+    @PostMapping("/grid/export")
+    public R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO) {
+        return comMngPopulationService.getGridPopulationExport(populationExportDTO);
+    }
+
+    /**
+     * 综治后台-居民管理小区列表
+     * @param name  小区名字
+     * @return  小区列表
+     */
+    @GetMapping("/village/relation")
+    public R relationVillage(@RequestParam("name") String name) {
+        return comMngPopulationService.relationVillage(name);
+    }
+
+    @PostMapping("/subordinate")
+    public R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO) {
+        return comMngPopulationHouseService.subordinate(subordinateDTO);
+    }
+
+    @PostMapping("/relation/house")
+    public R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO) {
+        return comMngPopulationHouseService.populationRelationHouse(relationHouseDTO);
+    }
 
 
 }

--
Gitblit v1.7.1