From f76d5cce48317ef3d7c3b243742c4e4beb81e0ec Mon Sep 17 00:00:00 2001 From: majintao Date: Wed, 2 Apr 2025 15:20:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E6=89=80=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E6=94=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComprehensiveQueryController.java | 47 ++++++++++++------- .../open/AdministrativeMappingService.java | 8 +++- .../AdministrativeMappingServiceImpl.java | 42 +++++++++++++++-- 3 files changed, 76 insertions(+), 21 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index d455751e1..f2037adbc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -38,10 +38,7 @@ import com.fangjia.service.district.DistrictStatService; import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; import com.fangjia.service.mongo.fangjia.*; -import com.fangjia.service.open.ApiUserAuthorityService; -import com.fangjia.service.open.EvaluateFactorService; -import com.fangjia.service.open.EvaluateRatioService; -import com.fangjia.service.open.FangjiaOfficialAreaService; +import com.fangjia.service.open.*; import com.fangjia.service.web.AddressService; import net.sf.json.JSONObject; import org.apache.commons.lang.ArrayUtils; @@ -99,6 +96,8 @@ public class ComprehensiveQueryController { private EvaluateRatioService evaluateRatioService; + private AdministrativeMappingService administrativeMappingService; + private static final int EVALUATE_SHOW_DETAIL = 1; private static final Map PROPERTY_TYPES = new HashMap() { { @@ -235,19 +234,22 @@ public class ComprehensiveQueryController { } String cityStr = model.getCity(); - if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { - AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); - if (administrativeDivision == null) { + String districtStr = model.getDistrict(); + String cityShort = ""; + if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+") && StringUtils.isBlank(districtStr)) { + cityShort = administrativeMappingService.findCityShortByCityCode(cityStr); + if (StringUtils.isBlank(cityShort)) { mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); return mav; } - String city = administrativeDivision.getCityShort(); - if (StringUtils.isBlank(city)) { - mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); + } else if (districtStr.matches("\\d+")) { + cityShort = administrativeMappingService.findDistrictShortByDistrictCode(cityStr, districtStr); + if (StringUtils.isBlank(cityShort)) { + mav.setModel(BasicModel.buildBadRequestModel("区县代码错误")); return mav; } - model.setCity(city); } + model.setCity(cityShort); HttpRequest httpRequest = new HttpRequest(); JSONObject json = null; @@ -264,9 +266,11 @@ public class ComprehensiveQueryController { try { matchResponse = httpRequest.getJsonContent("http://open.fangjia.com/address/match", communityAvgPriceParams, "UTF-8"); // matchResponse = httpRequest.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v2/match", communityAvgPriceParams, "UTF-8"); - } catch (HttpRequestException e) { + } catch ( + HttpRequestException e) { } + // 去掉经纬度解析 // if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { // //加上高德获取经纬度 和 根据经纬度估值 @@ -302,12 +306,14 @@ public class ComprehensiveQueryController { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); return mav; } + String id = matchResponse.getJSONObject("result").getString("id"); District district = districtService.findById(id); if (district == null) { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); return mav; } + MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, matchResponse.getJSONObject("result")); DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(district)); if (null != statBo) { @@ -359,7 +365,8 @@ public class ComprehensiveQueryController { propertyEvaluationModel.setName(district.getName()); try { evaluateAction(propertyEvaluationModel, httpServletRequest, houseValueInformation, mav); - } catch (IllegalAccessException e) { + } catch ( + IllegalAccessException e) { } // 价格下调10% @@ -379,17 +386,19 @@ public class ComprehensiveQueryController { sampleQuery.setStrctureArea(model.getSize()); sampleQuery.setAddress(model.getAddress()); -// RestfulModelAndView houseCaseMav = new RestfulModelAndView(); + // RestfulModelAndView houseCaseMav = new RestfulModelAndView(); List querys = null; try { querys = convertSampileQueryToBean(district, sampleQuery); - } catch (Exception e) { + } catch ( + Exception e) { mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); return mav; } if (null == sampleQuery.getMax()) { sampleQuery.setMax(10); } + // 此处慢 long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSampleForBse(querys, sampleQuery.getMax()); @@ -441,7 +450,9 @@ public class ComprehensiveQueryController { } // 将周边POI数据放到结果集 houseValueInformation.setSurroundingPoi(facilitys); - mav.setModel(BasicModel.buildOKModel().setResult(houseValueInformation)); + mav.setModel(BasicModel.buildOKModel(). + + setResult(houseValueInformation)); return mav; } @@ -1397,5 +1408,9 @@ public class ComprehensiveQueryController { public void setAdministrativeDivisionService(AdministrativeDivisionService administrativeDivisionService) { this.administrativeDivisionService = administrativeDivisionService; } + + public void setAdministrativeMappingService(AdministrativeMappingService administrativeMappingService) { + this.administrativeMappingService = administrativeMappingService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java index a0fc680e1..3c26ea411 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java @@ -12,8 +12,12 @@ import java.util.List; public interface AdministrativeMappingService { + public String findCityCodeByCityShort(String cityShort); - public String findCityCodeByCityShort(String cityShort); - public String findCityByCityShort(String cityShort) ; + public String findCityByCityShort(String cityShort); + + public String findCityShortByCityCode(String cityCode); + + public String findDistrictShortByDistrictCode(String cityCode,String districtCode); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java index 521b1e5ef..7b7cbbeed 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java @@ -67,7 +67,7 @@ public class AdministrativeMappingServiceImpl implements AdministrativeMappingSe )); - public String findCityCodeByCityShort(String cityShort) { + public String findCityCodeByCityShort(String cityShort) { ArrayList params = new ArrayList(); params.add(new QueryParam("cityShort", cityShort)); params.add(new QueryParam("type", "城市")); @@ -78,7 +78,7 @@ public class AdministrativeMappingServiceImpl implements AdministrativeMappingSe return null; } - public String findCityByCityShort(String cityShort) { + public String findCityByCityShort(String cityShort) { if (CITY_SHORT.contains(cityShort)) { ArrayList params = new ArrayList(); params.add(new QueryParam("cityShort", cityShort)); @@ -91,7 +91,43 @@ public class AdministrativeMappingServiceImpl implements AdministrativeMappingSe return cityShort; } - public void setAdministrativeMappingDao(AdministrativeMappingDao administrativeMappingDao) { + @Override + public String findCityShortByCityCode(String cityCode) { + ArrayList params = new ArrayList(); + params.add(new QueryParam("mzbCityCode", cityCode)); + params.add(new QueryParam("type", "城市")); + List allByParams = administrativeMappingDao.findAllByParams(params); + + if (allByParams != null && !allByParams.isEmpty()) { + if (allByParams.size() == 1) { + AdministrativeMapping firstByParams = allByParams.get(0); + return StringUtils.isBlank(firstByParams.getCityShort()) ? "" : firstByParams.getCityShort(); + } + return ""; + } + return ""; + } + + @Override + public String findDistrictShortByDistrictCode(String cityCode, String districtCode) { + ArrayList params = new ArrayList(); + params.add(new QueryParam("mzbCityCode", cityCode)); + params.add(new QueryParam("mzbDistrictCode", districtCode)); + params.add(new QueryParam("type", "区域")); + List allByParams = administrativeMappingDao.findAllByParams(params); + + if (allByParams != null && !allByParams.isEmpty()) { + if (allByParams.size() == 1) { + AdministrativeMapping firstByParams = allByParams.get(0); + return StringUtils.isBlank(firstByParams.getCityShort()) ? "" : firstByParams.getCityShort(); + } + return ""; + } + return ""; + } + + + public void setAdministrativeMappingDao(AdministrativeMappingDao administrativeMappingDao) { this.administrativeMappingDao = administrativeMappingDao; } } From f0f55c67a6b01c94b342673c6328933723650d3e Mon Sep 17 00:00:00 2001 From: majintao Date: Wed, 2 Apr 2025 15:40:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E6=89=80=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E6=94=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/ComprehensiveQueryController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index f2037adbc..e0d0fddff 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -235,14 +235,14 @@ public class ComprehensiveQueryController { String cityStr = model.getCity(); String districtStr = model.getDistrict(); - String cityShort = ""; + String cityShort = model.getCity(); if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+") && StringUtils.isBlank(districtStr)) { cityShort = administrativeMappingService.findCityShortByCityCode(cityStr); if (StringUtils.isBlank(cityShort)) { mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); return mav; } - } else if (districtStr.matches("\\d+")) { + } else if (StringUtils.isNotBlank(districtStr) && districtStr.matches("\\d+")) { cityShort = administrativeMappingService.findDistrictShortByDistrictCode(cityStr, districtStr); if (StringUtils.isBlank(cityShort)) { mav.setModel(BasicModel.buildBadRequestModel("区县代码错误"));