From b011bd6481707b75ae1aecddba029115fa9a6a43 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 02 七月 2021 17:56:20 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 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 05b4fb4..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,9 +1,13 @@
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.*;
@@ -18,17 +22,36 @@
@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();
@@ -44,11 +67,21 @@
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);
@@ -58,4 +91,45 @@
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