Merge remote-tracking branch 'origin/master'

This commit is contained in:
sjshenjian
2024-11-07 15:49:58 +08:00
8 changed files with 116 additions and 2 deletions
+1
View File
@@ -21,3 +21,4 @@ deliverables/*/.idea
/projects/fangjia-open/.idea
*.idea*
classes
**/sdklog/*
@@ -619,6 +619,7 @@ public class AddressController {
params.setProvince(model.getProvince());
params.setUseMap(model.isUseMap());
params.setDebugName(model.getDebugName());
params.setPropertyType(model.getPropertyType());
long start = System.currentTimeMillis();
Building building = addressParserService.parser(params);
long end = System.currentTimeMillis();
@@ -22,6 +22,7 @@ public class AddesssMatchModel extends FangjiaApiModel {
private boolean useMap;
private String address_1;
private String address_2;
private String propertyType;
private String showCode;
@@ -153,4 +154,12 @@ public class AddesssMatchModel extends FangjiaApiModel {
public void setShowCode(String showCode) {
this.showCode = showCode;
}
public String getPropertyType() {
return propertyType;
}
public void setPropertyType(String propertyType) {
this.propertyType = propertyType;
}
}
@@ -0,0 +1,50 @@
package com.fangjia.script.wenyan
import com.fangjia.core.ProvinceData
import com.fangjia.core.RegionData
import com.fangjia.core.util.DateUtil
import com.fangjia.core.util.Mongo3Utils
import com.fangjia.script.util.CommonUtils
import com.fangjia.script.util.DbUtils
import com.fangjia.script.util.ElasticUtils
import com.fangjia.script.util.ExcelUtils
import com.mongodb.BasicDBObject
import org.bson.Document
import org.elasticsearch.action.get.GetRequest
import org.elasticsearch.action.get.GetResponse
import org.elasticsearch.client.RequestOptions
import org.elasticsearch.client.RestHighLevelClient
////def data = []
////data << ["ID","城市","区域","名称","地址", "财力评级"]
//RestHighLevelClient client = ElasticUtils.getClient89("192.168.0.89")
//district_analy_data_client = Mongo3Utils.getDbCollection("fangjia_stat", "district_analy_data")
//level_map = ["1": "S", "2": "A", "3": "B", "4": "C", "5": "D"]
//level_maps = new HashMap<>()
//for(def key in level_map.keySet()){
// level_maps.put(level_map[key], key)
//}
//ExcelUtils.modify("C:\\Users\\goojia\\Desktop\\财力评级-厦门.xlsx",{List item->
//// GetResponse response = client.get(new GetRequest("community_summary", item["A"] as String), RequestOptions.DEFAULT)
//// def query = new Document("city", item['B'].toString().replace("市", ""))
//// query.append("region", item['C'].replace("区", ""))
//// query.append("district_name", item["D"])
//// def stat = district_analy_data_client.find(query).first()
//// println(query)
//// item["F"] = response.getSourceAsMap()?.consumption_rating
//// item["G"] = stat?.community_rating
// item["G"] = level_maps.get(item["G"], null)
//// println(item)
//})
//System.exit(0)
////for (def region in ["思明", "翔安", "湖里"]) {
//// DbUtils.seaweed.find(new BasicDBObject("city", "厦门").append("region", region).append("cat", "district").append("status", 0)).each { BasicDBObject dbo ->
//// println("${dbo._id.toString()}\t${dbo.city}市\t${dbo.region}区\t${dbo.name}\t${dbo.address}")
//// }
////}
ExcelUtils.read("C:\\Users\\goojia\\Desktop\\海南省城市均价.xlsx",1).each {List item->
def yearMonth = DateUtil.formatByPattern(item[0], "yyyyMM").toInteger()
println(item)
}
@@ -0,0 +1,15 @@
package com.fangjia.script.wenyan.xiamen
import com.fangjia.core.util.DataUtil
import com.fangjia.core.util.GeoUtils
import com.fangjia.script.util.ExcelUtils
ExcelUtils.multiThreadingModify("D:\\本地化部署\\厦门银行数据\\网点经纬度业务选择网点.xlsx",{List item ->
def location = item['E']
if(location){
def lng = location.toString().split(",")[0].toDouble()
def lat = location.toString().split(",")[1].toDouble()
def bounds = GeoUtils.getAround(lat, lng, 3000)
item["G"] = "${DataUtil.getRound(6, bounds[2])},${DataUtil.getRound(6,bounds[0])},${DataUtil.getRound(6,bounds[3])},${DataUtil.getRound(6,bounds[1])}"
}
})
@@ -10,6 +10,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea;
import com.fangjia.dal.mongo.model.bkoff.HouseLoudong;
import com.fangjia.dal.mongo.model.bkoff.Loudong;
import com.fangjia.dal.seaweed.dao.SeaweedDao;
import com.fangjia.dal.seaweed.model.District;
import com.fangjia.dal.seaweed.model.Seaweed;
import com.fangjia.service.address.mode.*;
import com.fangjia.service.address.processor.AddressDistrictProcessors;
@@ -436,8 +437,27 @@ public class AddressParserServiceImpl implements AddressParserService {
AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType);
if(scoreResult.getResult().size() > 0){
AddressMatchMetaData matchedMate = scoreResult.getResult().get(0);
if(matchedMate.getMetaDataType() == MetaDataType.CPDB){
return new Building(districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate));
District district = districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS);
if("1".equals(addr.getPropertyType())){
if(!district.getEstateType2().equals("别墅") || !district.getName().endsWith("别墅")){
District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "别墅"), district.getCategory());
if(districtNew != null){
district = districtNew;
}
}
}else if("2".equals(addr.getPropertyType())){
if(!district.getEstateType2().equals("商住") || !district.getName().endsWith("商住楼")){
District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "商住楼"), district.getCategory());
if(districtNew != null){
district = districtNew;
}
}
}
return new Building(districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate));
}else{
return new Building(matchedMate, scoreResult.getScore(matchedMate));
}
@@ -500,6 +520,7 @@ public class AddressParserServiceImpl implements AddressParserService {
addr.setProvince(params.getProvince());
addr.setDebugName(params.getDebugName());
addr.setUseMap(params.isUseMap());
addr.setPropertyType(params.getPropertyType());
return AddressProcessors.process(addr);
}
@@ -15,6 +15,7 @@ import java.util.*;
*/
public class Address {
private String propertyType;
private String province;
private String city;
private String district;
@@ -769,6 +770,14 @@ public class Address {
this.geoRegion = geoRegion;
}
public String getPropertyType() {
return propertyType;
}
public void setPropertyType(String propertyType) {
this.propertyType = propertyType;
}
@Override
public String toString() {
return "Address{" +
@@ -14,7 +14,7 @@ public class MatchParams {
private String suggestName;
/**调试时断点小区名*/
private String debugName;
private String propertyType;
/**用户输入地址*/
private String address;
/**建筑类型解析出对应的建筑物*/
@@ -135,4 +135,12 @@ public class MatchParams {
public void setDebugName(String debugName) {
this.debugName = debugName;
}
public String getPropertyType() {
return propertyType;
}
public void setPropertyType(String propertyType) {
this.propertyType = propertyType;
}
}