From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 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 045d139..d6a8b9a 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,5 +1,11 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -10,11 +16,8 @@
import com.panzhihua.service_community.service.ComExServicemanService;
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;
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -31,7 +34,8 @@
/**
* 获取人口数据信息
*
- * @param populationListDTO 请求参数
+ * @param populationListDTO
+ * 请求参数
* @return 人口数据
*/
@PostMapping("/list/app")
@@ -42,8 +46,9 @@
/**
* 根据人口id获取人口详情
*
- * @param populationId 人口id
- * @return 人口详情
+ * @param populationId
+ * 人口id
+ * @return 人口详情
*/
@GetMapping("/detail/app")
public R getPopulationDetail(@RequestParam("populationId") Long populationId) {
@@ -62,8 +67,10 @@
/**
* 综治后台-居民列表
- * @param populationListDTO 请求参数
- * @return 居民列表
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 居民列表
*/
@PostMapping("/grid/list")
public R getGridPopulationAdminList(@RequestBody ComMngPopulationListDTO populationListDTO) {
@@ -72,8 +79,10 @@
/**
* 综治后台-删除居民
- * @param ids 居民id集合
- * @return 删除结果
+ *
+ * @param ids
+ * 居民id集合
+ * @return 删除结果
*/
@PostMapping("/grid/del")
public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
@@ -82,11 +91,13 @@
/**
* 综治后台-居民详情
- * @param populationId 居民id
- * @return 居民详情
+ *
+ * @param populationId
+ * 居民id
+ * @return 居民详情
*/
@GetMapping("/grid/get")
- public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
+ public R getGridPopulationAdminDetail(@RequestParam("populationId") Long populationId) {
return comMngPopulationService.getPopulationDetailApp(populationId);
}
@@ -97,7 +108,8 @@
/**
* 综治后台-居民标签栏统计
- * @return 居民统计
+ *
+ * @return 居民统计
*/
@GetMapping("/grid/statistics")
public R getGridPopulationStatistics(@RequestParam("communityId") Long communityId) {
@@ -106,8 +118,10 @@
/**
* 综治后台-居民导出查询居民数据
- * @param populationExportDTO 请求参数
- * @return 导出结果
+ *
+ * @param populationExportDTO
+ * 请求参数
+ * @return 导出结果
*/
@PostMapping("/grid/export")
public R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO) {
@@ -116,8 +130,10 @@
/**
* 综治后台-居民管理小区列表
- * @param name 小区名字
- * @return 小区列表
+ *
+ * @param name
+ * 小区名字
+ * @return 小区列表
*/
@GetMapping("/village/relation")
public R relationVillage(@RequestParam("name") String name) {
@@ -137,13 +153,13 @@
/**
* 分页查询退役军人列表
*
- * @param comExServicemanDTO 请求参数
+ * @param comExServicemanDTO
+ * 请求参数
* @return 退役军人列表
*/
@PostMapping("/page/exServiceman")
- public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO){
+ public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO) {
return comExServicemanService.getPageExServiceman(comExServicemanDTO);
}
-
}
--
Gitblit v1.7.1