北交所行政区划改表

This commit is contained in:
majintao
2025-04-02 15:20:11 +08:00
parent 0b9aa8bed0
commit f76d5cce48
3 changed files with 76 additions and 21 deletions
@@ -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<String, String> PROPERTY_TYPES = new HashMap<String, String>() {
{
@@ -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<CollateralSampleQueryBean> 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<Collateral> 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;
}
}
@@ -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);
}
@@ -67,7 +67,7 @@ public class AdministrativeMappingServiceImpl implements AdministrativeMappingSe
));
public String findCityCodeByCityShort(String cityShort) {
public String findCityCodeByCityShort(String cityShort) {
ArrayList<QueryParam> params = new ArrayList<QueryParam>();
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<QueryParam> params = new ArrayList<QueryParam>();
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<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("mzbCityCode", cityCode));
params.add(new QueryParam("type", "城市"));
List<AdministrativeMapping> 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<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("mzbCityCode", cityCode));
params.add(new QueryParam("mzbDistrictCode", districtCode));
params.add(new QueryParam("type", "区域"));
List<AdministrativeMapping> 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;
}
}