From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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
index 71a4910..1c17c23 100644
--- 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
@@ -1,21 +1,20 @@
package com.panzhihua.grid_app.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
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
@@ -28,7 +27,7 @@
@PostMapping("/list")
@ApiOperation(value = "查询居民列表", response = PopulationListVO.class)
- public R list(@RequestBody PagePopulationListDTO populationListDTO){
+ public R list(@RequestBody PagePopulationListDTO populationListDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
populationListDTO.setCommunityId(loginUserInfo.getCommunityId());
return communityService.getPopulationListByApp(populationListDTO);
@@ -36,8 +35,8 @@
@GetMapping("/detail")
@ApiOperation(value = "查询居民详情", response = PopulationDetailVO.class)
- public R detail(@RequestParam("populationId") Long populationId){
- if(populationId == null){
+ public R detail(@RequestParam("populationId") Long populationId) {
+ if (populationId == null) {
return R.fail("参数错误");
}
return communityService.getPopulationDetailByApp(populationId);
@@ -45,10 +44,8 @@
@GetMapping("/repair/noToken")
@ApiOperation(value = "修复居民身份证号码加密接口-不要乱调用")
- public R repair(){
+ public R repair() {
return communityService.getPopulationRepairByApp();
}
-
-
}
--
Gitblit v1.7.1