From 3e6740a0b9d7afd59803176204cda36a40651f83 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 15:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=88=BF=E5=B1=8B=E6=A5=BC?= =?UTF-8?q?=E5=AE=87=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=BA=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/NeighborHoodController.java | 3 ++- .../main/java/com/epmet/service/NeighborHoodService.java | 5 +++-- .../com/epmet/service/impl/NeighborHoodServiceImpl.java | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index 5c813ea6a8..f7c669b5d9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -31,6 +31,7 @@ import com.epmet.dao.IcBuildingDao; import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcBuildingEntity; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.service.BuildingService; @@ -77,7 +78,7 @@ public class NeighborHoodController { @PostMapping("neighborhoodlist") - public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ + public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO); return new Result().ok(neighborHoodService.listNeighborhood(formDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java index 7f6b814440..78b55aea8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java @@ -18,9 +18,10 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.excel.IcNeighborHoodExcel; import javax.servlet.http.HttpServletResponse; @@ -36,7 +37,7 @@ public interface NeighborHoodService{ void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); - PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO); + PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO); void updateNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index f79f02204c..5cdde1e697 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -15,9 +15,10 @@ import com.epmet.dao.*; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcNeighborHoodPropertyDTO; -import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.*; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.feign.GovOrgOpenFeignClient; @@ -109,7 +110,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { * @return */ @Override - public PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO) { + public PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO) { if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){ //根据网格过滤 formDTO.setGridId(formDTO.getId()); @@ -117,7 +118,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //根据组织过滤 formDTO.setAgencyId(formDTO.getId()); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); }