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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index b4d7212..fafb4b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -19,7 +19,7 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.dtos.grid.*;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -3257,7 +3257,7 @@
R getConf(@RequestParam("code") String code);
/**
- * 根据社区id获取社区下人口数据信息
+ * 获取人口数据信息
*
* @param populationListDTO 请求参数
* @return 人口数据
@@ -3268,8 +3268,8 @@
/**
* 根据人口id获取人口详情
*
- * @param populationId
- * @return
+ * @param populationId 人口id
+ * @return 人口详情
*/
@GetMapping("/population/detail/app")
R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
@@ -3397,4 +3397,82 @@
*/
@PostMapping("/village/grid/building/house/del/population")
R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 综治后台-居民标签栏统计
+ * @return 居民统计
+ */
+ @GetMapping("/population/grid/statistics")
+ R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ * @param populationExportDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/population/grid/export")
+ R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
+
+ /**
+ * 综治后台-居民管理小区列表
+ * @param name 小区名字
+ * @return 小区列表
+ */
+ @GetMapping("/population/village/relation")
+ R relationVillage(@RequestParam("name") String name);
+
+ /**
+ * 综治后台-居民管理-级联列表
+ * @param subordinateDTO 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/population/subordinate")
+ R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);
+
+ /**
+ * 综治后台-居民关联房屋
+ * @param relationHouseDTO 请求参数
+ * @return 关联结果
+ */
+ @PostMapping("/population/relation/house")
+ R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);
+
+ /**
+ * 综治后台-批量删除小区
+ * @param villageIds 小区id集合
+ * @return 删除结果
+ */
+ @PostMapping("/village/admin/del")
+ R delGridVillage(@RequestBody List<Long> villageIds);
+
+ /**
+ * 综治后台-小区内居民列表
+ * @param villagePopulationDTO 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/village/admin/population/list")
+ R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);
+
+ /**
+ * 综治后台-居民下房屋列表
+ * @param villagePopulationHouseDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/admin/population/house/list")
+ R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);
+
+ /**
+ * 综治后台-小区统计
+ * @return 小区统计结果
+ */
+ @GetMapping("/village/admin/statistics")
+ R getGridVillageStatistics();
+
+ /**
+ * 综治后台-小区列表导出
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/admin/export")
+ R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
}
--
Gitblit v1.7.1