综合查询接口增加输入城市代码也可以出值

This commit is contained in:
mjt
2024-01-25 18:42:53 +08:00
parent 3575230089
commit 9adddbb21d
9 changed files with 255 additions and 17 deletions
@@ -1,24 +1,20 @@
package com.fangjia.open.controllers;
import com.fangjia.core.util.*;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
import com.fangjia.dal.common.DistrictKey;
import com.fangjia.dal.mongo.fangjia.model.ServerArea;
import com.fangjia.dal.mongo.model.ApiUserCfg;
import com.fangjia.dal.mongo.model.DistrictFacilitys;
import com.fangjia.dal.mongo.model.Evaluation;
import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap;
import com.fangjia.dal.mongo.model.bkoff.Loudong;
import com.fangjia.dal.mongo.open.model.ApiUserAuthority;
import com.fangjia.dal.mongo.open.model.EvaluateRatio;
import com.fangjia.dal.seaweed.model.District;
import com.fangjia.open.HttpCode;
import com.fangjia.open.OpenHttpCodeEnum;
import com.fangjia.open.dto.HouseValueInformationDto;
import com.fangjia.open.dto.UniversalDto;
import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto;
import com.fangjia.open.interceptors.AuthenticationBean;
import com.fangjia.open.interceptors.Authority;
import com.fangjia.open.interceptors.Role;
import com.fangjia.open.model.*;
import com.fangjia.open.util.CommonDtoUtils;
import com.fangjia.open.util.CommonUtils;
@@ -35,7 +31,6 @@ 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.*;
import com.fangjia.service.tool.OpenLogService;
import com.fangjia.service.web.AddressService;
import net.sf.json.JSONObject;
import org.apache.commons.lang.ArrayUtils;
@@ -54,7 +49,7 @@ import static com.poseidon.util.TypeConverter.convertToString;
* @author 13607
* @since 2023/12/12 10:29
*/
@Authority(role = Role.USER)
//@Authority(role = Role.USER)
public class ComprehensiveQueryController {
private DistrictService districtService;
@@ -84,6 +79,7 @@ public class ComprehensiveQueryController {
static final int BAI_DU_GEO = 1;// 百度系坐标
static final int GAO_DE_GEO = 2;// 高德系坐标
private AdministrativeDivisionService administrativeDivisionService;
private EvaluateRatioService evaluateRatioService;
@@ -218,10 +214,21 @@ public class ComprehensiveQueryController {
return mav;
}
String cityStr = model.getCity();
if (cityStr.matches("\\d+")) {
AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr);
String city = administrativeDivision.getCityShort();
if (administrativeDivision == null || StringUtils.isBlank(city)) {
mav.setModel(BasicModel.buildBadRequestModel("城市代码错误"));
return mav;
}
model.setCity(city);
}
HttpRequest httpRequest = new HttpRequest();
JSONObject json = null;
Map<String, String> communityAvgPriceParams = new HashMap<String, String>();
// communityAvgPriceParams.put("city", model.getCity());
communityAvgPriceParams.put("city", model.getCity());
communityAvgPriceParams.put("address", model.getAddress());
communityAvgPriceParams.put("category", model.getCategory());
communityAvgPriceParams.put("useMap", String.valueOf(model.isUseMap()));
@@ -232,7 +239,7 @@ public class ComprehensiveQueryController {
} catch (HttpRequestException e) {
}
if(matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) {
if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) {
mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!"));
return mav;
}
@@ -287,7 +294,7 @@ public class ComprehensiveQueryController {
// RestfulModelAndView houseCaseMav = new RestfulModelAndView();
List<CollateralSampleQueryBean> querys = null;
try {
querys = convertSampileQueryToBean(district,sampleQuery);
querys = convertSampileQueryToBean(district, sampleQuery);
} catch (Exception e) {
mav.setModel(BasicModel.buildBadRequestModel(e.getMessage()));
return mav;
@@ -299,7 +306,7 @@ public class ComprehensiveQueryController {
long start = System.currentTimeMillis();
List<Collateral> collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax());
long end = System.currentTimeMillis();
System.out.println("用时:"+(end-start));
System.out.println("用时:" + (end - start));
Collateral collateral = collaterals.get(0);
List<Sample> samples = collateral.getSample();
UniversalDto houseCaseDto = UniversalDto.newDto();
@@ -426,7 +433,7 @@ public class ComprehensiveQueryController {
return propertyModel;
}
private List<CollateralSampleQueryBean> convertSampileQueryToBean(District district,SampleQuery... queries) throws Exception {
private List<CollateralSampleQueryBean> convertSampileQueryToBean(District district, SampleQuery... queries) throws Exception {
List<CollateralSampleQueryBean> queryBeans = new ArrayList<CollateralSampleQueryBean>(queries.length);
for (SampleQuery q : queries) {
@@ -1230,8 +1237,6 @@ public class ComprehensiveQueryController {
}
public void setEvaluationService(EvaluationService evaluationService) {
this.evaluationService = evaluationService;
}
@@ -1254,7 +1259,6 @@ public class ComprehensiveQueryController {
}
public BatchEvaluateService getBatchEvaluateService() {
return batchEvaluateService;
}
@@ -1313,5 +1317,8 @@ public class ComprehensiveQueryController {
this.districtFacilitysService = districtFacilitysService;
}
public void setAdministrativeDivisionService(AdministrativeDivisionService administrativeDivisionService) {
this.administrativeDivisionService = administrativeDivisionService;
}
}
@@ -0,0 +1,10 @@
package com.fangjia.open;
public class test {
public static void main(String[] args) {
String a = "123545";
String b ="i980";
System.out.println(a.matches("\\d+"));
System.out.println(b.matches("\\d+"));
}
}