From c195b4ebc79b60539083f7089a5f878c1604fce9 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 30 六月 2021 18:05:11 +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 |   24 ++++++++++++++++++++++++
 1 files changed, 24 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..05b4fb4 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,6 +1,7 @@
 package com.panzhihua.service_community.api;
 
 import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -8,6 +9,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -32,6 +34,28 @@
         return comMngPopulationService.getPopulationRepairByApp();
     }
 
+    /**
+     * 综治后台-居民列表
+     * @param populationListDTO 请求参数
+     * @return  居民列表
+     */
+    @PostMapping("/grid/list")
+    public R getGridPopulationAdminList(@RequestBody ComMngPopulationListDTO populationListDTO) {
+        return comMngPopulationService.getGridPopulationAdminList(populationListDTO);
+    }
 
+    @PostMapping("/grid/del")
+    public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
+        return comMngPopulationService.delGridPopulationAdmin(ids);
+    }
 
+    @GetMapping("/grid/get")
+    public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
+        return comMngPopulationService.getPopulationDetailApp(populationId);
+    }
+
+    @GetMapping("/binding")
+    public R binding() {
+        return comMngPopulationService.binding();
+    }
 }

--
Gitblit v1.7.1