优化地址均价接口

This commit is contained in:
沈健
2024-09-23 09:54:40 +08:00
parent 197250766b
commit 888f51f0fe
@@ -1,10 +1,12 @@
package com.fangjia.open.controllers;
import com.fangjia.core.util.HttpRequest;
import com.fangjia.dal.common.DistrictKey;
import com.fangjia.dal.mongo.model.VillageIdentify;
import com.fangjia.dal.seaweed.model.District;
import com.fangjia.open.dto.addressGovernance.*;
import com.fangjia.open.dto.addressGovernance.DistrictDto;
import com.fangjia.open.dto.addressGovernance.DistrictIdentifyDto;
import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto;
import com.fangjia.open.dto.addressGovernance.StructureAndCompleteDto;
import com.fangjia.open.interceptors.Authority;
import com.fangjia.open.interceptors.Role;
import com.fangjia.open.model.AddesssMatchModel;
@@ -12,7 +14,7 @@ import com.fangjia.open.model.AddressModel;
import com.fangjia.open.model.BasicModel;
import com.fangjia.open.model.RestfulModelAndView;
import com.fangjia.open.util.CommonDtoUtils;
import com.fangjia.service.bo.DistrictStatBo;
import com.fangjia.service.bo.DistrictAvgBo;
import com.fangjia.service.datastore.DistrictService;
import com.fangjia.service.district.DistrictStatService;
import com.fangjia.service.mongo.fangjia.VillageIdentifyService;
@@ -39,9 +41,7 @@ import sun.misc.BASE64Encoder;
import java.io.IOException;
import java.net.Authenticator;
import java.net.InetSocketAddress;
import java.net.PasswordAuthentication;
import java.net.Proxy;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
@@ -372,18 +372,26 @@ public class AddrSvcController {
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
BasicModel basicModel = new BasicModel(200, "ok");
if (json != null && json.size() > 0) {
MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json);
MatchedBuildingDto dto = new MatchedBuildingDto();
if (json.containsKey("id")) {
dto.setId(json.getString("id"));
}
if (json.containsKey("city")) {
dto.setCity(json.getString("city"));
}
if (json.containsKey("district")) {
dto.setDistrict(json.getString("district"));
}
if (json.containsKey("name")) {
dto.setName(json.getString("name"));
}
District district = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), "district");
if (null != district) {
DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()));
//DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName()));
DistrictAvgBo statBo = districtStatService.findDistrictStat(district, "district", null) ;
if (null != statBo) {
if (statBo.getDistrictStat() != null) {
dto.setAvgPrice(statBo.getDistrictStat().getAvgPrice());
} else if (statBo.getVillaDistrictStat() != null) {
dto.setAvgPrice(statBo.getVillaDistrictStat().getAvgPrice());
}
dto.setAvgPrice(statBo.getAvgPrice());
}
}
basicModel.setResult(dto);