From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 95f6d35..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
@@ -3,8 +3,11 @@
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.*;
@@ -19,6 +22,8 @@
@Resource
private ComMngPopulationService comMngPopulationService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
/**
* 获取人口数据信息
@@ -97,7 +102,7 @@
}
/**
- * 综治后台-居民导出
+ * 综治后台-居民导出查询居民数据
* @param populationExportDTO 请求参数
* @return 导出结果
*/
@@ -106,5 +111,25 @@
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