From 24a4fb2163330f85ea7759392284094f3f277942 Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 1 Aug 2024 10:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=86=9C=E8=B0=83=E7=94=A8=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=BB=93=E6=9E=9C=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 2 +- .../mongo/fangjia/VillageIdentifyService.java | 1 + .../fangjia/VillageIdentifyServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index d5e0ffc43..b2aecb6a8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -609,7 +609,7 @@ public class AddrSvcController { params.put("type", type); params.put("showFullValue", "2"); Pager pager = new Pager(1, 1); - List villageIdentifyList = villageIdentifyService.findAll(villageType, model.getCity(), model.getAddress(), pager); + List villageIdentifyList = villageIdentifyService.findByCityAndAddress(villageType, model.getCity(), model.getAddress(), pager); VillageIdentify villageResult = CollectionUtils.isNotEmpty(villageIdentifyList) ? villageIdentifyList.get(0) : null; if (villageResult != null && StringUtils.isNotBlank(villageResult.getVerifyFlag())) { Map resultMap = new HashMap(); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyService.java index a0f8f6348..068fd06c6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyService.java @@ -17,5 +17,6 @@ public interface VillageIdentifyService { int count(String villageType,String city1,String address); List findAll(String villageType,String city1,String address,Pager pager); + List findByCityAndAddress(String villageType,String city1,String address,Pager pager); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java index 998576dd1..a2e66f603 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java @@ -62,6 +62,23 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService { return villageIdentifyDao.findAllByParams(queryParams, pager.getStartRow(), pager.getPageSize()); } + @Override + public List findByCityAndAddress(String villageType, String city1, String address, Pager pager) { + List queryParams = new ArrayList(); + if (StringUtils.isNotBlank(villageType)) { + queryParams.add(new QueryParam("villageType", villageType)); + }else { + queryParams.add(new QueryParam("villageType", "ΆΤΉ«")); + } + if (StringUtils.isNotBlank(city1)) { + queryParams.add(new QueryParam("cityParam", city1)); + } + if (StringUtils.isNotBlank(address)) { + queryParams.add(new QueryParam("address", address)); + } + return villageIdentifyDao.findAllByParams(queryParams, pager.getStartRow(), pager.getPageSize()); + } + public void setVillageIdentifyDao(VillageIdentifyDao villageIdentifyDao) { this.villageIdentifyDao = villageIdentifyDao; }