From 8d826b27640207f55e91eb2cdf31611fab875055 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 18 Aug 2025 16:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/HouseController.java | 18 +++++++++---- .../open/controllers/JnBankController.java | 27 ++++++++++++++----- .../fangjia/open/model/JNBankSearchModel.java | 2 +- .../open/ws/query/CollateralSampleQuery.java | 2 +- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 773bb3dc8..dc37725aa 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -295,12 +295,20 @@ public class HouseController { CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean(); BeanUtils.copyProperties(q, queryBean); String city = queryBean.getCity(); - FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); - if (fangjiaOfficialAreaMap == null) { - throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); + if(StringUtils.isNotBlank(q.getDistrict())){ + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(q.getDistrict()); + if (fangjiaOfficialAreaMap == null) { + throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity() + " ,district: " + q.getDistrict() + ")"); + } + queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); + queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); + }else{ + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(q.getCity()); + if(fangjiaOfficialAreaMap == null){ + throw new Exception("地区信息无法映射到房价网的地区信息->(province:" + q.getProvince() + " ,city: " + q.getCity()); + } + queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); } - queryBean.setFangjiaCity(fangjiaOfficialAreaMap.getFangjiaCity()); - queryBean.setFangjiaDistrict(fangjiaOfficialAreaMap.getFangjiaDistrict()); String propertyTypeCode = queryBean.getPropertyTypeCode(); if (!PROPERTY_TYPE_CODE_LIST.contains(propertyTypeCode)) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java index 2c7a22187..a678283c2 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java @@ -43,13 +43,28 @@ public class JnBankController { public Object searchAction(@Valid JNBankSearchModel model){ RestfulModelAndView mav = new RestfulModelAndView(); - FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDISTRICT_CD()); - if(fangjiaOfficialAreaMap == null){ - mav.setModel(BasicModel.buildBadRequestModel("错误的区划编码")); - return mav; + String city = null; + String region = null; + if(StringUtils.isNotBlank(model.getDISTRICT_CD())){ + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDISTRICT_CD()); + if(fangjiaOfficialAreaMap == null){ + mav.setModel(BasicModel.buildBadRequestModel("错误的区划编码")); + return mav; + } + + city = fangjiaOfficialAreaMap.getFangjiaCity(); + region = fangjiaOfficialAreaMap.getFangjiaDistrict(); + }else{ + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjiaCity(model.getCITY_CD()); + if(fangjiaOfficialAreaMap == null){ + mav.setModel(BasicModel.buildBadRequestModel("错误的城市编码")); + return mav; + } + + city = fangjiaOfficialAreaMap.getFangjiaCity(); } - String city = fangjiaOfficialAreaMap.getFangjiaCity(); - String region = fangjiaOfficialAreaMap.getFangjiaDistrict(); + + String cat; if("2".equals(model.getHOUSING_EST_TY_CD())){ cat = "district"; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/JNBankSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/JNBankSearchModel.java index 8bf3d7099..4d4895cdd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/JNBankSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/JNBankSearchModel.java @@ -12,7 +12,7 @@ public class JNBankSearchModel extends FangjiaApiModel { @NotBlank private String CITY_CD; - @NotBlank +// @NotBlank private String DISTRICT_CD; @NotBlank diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java index f8d1609ac..164ea0ef9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/ws/query/CollateralSampleQuery.java @@ -22,7 +22,7 @@ public class CollateralSampleQuery { private String city; /**区域*/ - @NotBlank +// @NotBlank private String district; @NotBlank