Merge branch 'open_v2' into 'master'

忽略区域

See merge request !1156
This commit is contained in:
2025-08-18 16:33:28 +08:00
4 changed files with 36 additions and 13 deletions
@@ -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)) {
@@ -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";
@@ -12,7 +12,7 @@ public class JNBankSearchModel extends FangjiaApiModel {
@NotBlank
private String CITY_CD;
@NotBlank
// @NotBlank
private String DISTRICT_CD;
@NotBlank
@@ -22,7 +22,7 @@ public class CollateralSampleQuery {
private String city;
/**区域*/
@NotBlank
// @NotBlank
private String district;
@NotBlank