From 8db659e85832cfccb88fd439f279ffe50d983d58 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 23 六月 2021 17:26:38 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java
new file mode 100644
index 0000000..ab79ac8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java
@@ -0,0 +1,48 @@
+package com.panzhihua.grid_app.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO;
+import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
+import com.panzhihua.common.model.vos.grid.PopulationListVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/population")
+@Api(tags = {"网格综治居民管理 @lyq"})
+public class PopulationApi extends BaseController {
+
+    @Resource
+    private CommunityService communityService;
+
+    @PostMapping("/list")
+    @ApiOperation(value = "查询居民列表", response = PopulationListVO.class)
+    public R list(@RequestBody PagePopulationListDTO populationListDTO){
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        populationListDTO.setCommunityId(loginUserInfo.getCommunityId());
+        return communityService.getPopulationListByApp(populationListDTO);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value = "查询居民详情", response = PopulationDetailVO.class)
+    public R detail(@RequestParam("populationId") Long populationId){
+        if(populationId == null){
+            return R.fail("参数错误");
+        }
+        return communityService.getPopulationDetailByApp(populationId);
+    }
+
+
+
+}

--
Gitblit v1.7.1