第三方修改
This commit is contained in:
+16
-13
@@ -91,11 +91,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
// ThirdPartPriceDataRepeatBatchUtils.findThirdPriceDataRepeatBatch(SHORT_DATE, thirdPartyColl)
|
||||
|
||||
cityMap.each{city,alias->
|
||||
// if(city == "北京"){
|
||||
println "开始加载【${city}】"
|
||||
def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
|
||||
districtMap.putAll(detailMap)
|
||||
// }
|
||||
println "开始加载【${city}】"
|
||||
def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
|
||||
districtMap.putAll(detailMap)
|
||||
}
|
||||
|
||||
while(flag){
|
||||
@@ -122,9 +120,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
def final AtomicInteger count_ = new AtomicInteger(0)
|
||||
def final AtomicInteger successIndex = new AtomicInteger(0)
|
||||
datas.each { dbo ->
|
||||
fixedThreadPool.execute(
|
||||
new Runnable() {
|
||||
void run() {
|
||||
// fixedThreadPool.execute(
|
||||
// new Runnable() {
|
||||
// void run() {
|
||||
try{
|
||||
println "(${rowIndex}-${count}-${count_.incrementAndGet()})【${dbo.city}-${dbo.region}-${dbo.name}-${dbo.address}-${dbo.source}】"
|
||||
if(dbo.name){
|
||||
@@ -164,12 +162,12 @@ class DataStandardBatch extends BaseBatch{
|
||||
}finally {
|
||||
latch.countDown()
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
}
|
||||
|
||||
latch.await()
|
||||
// latch.await()
|
||||
long end = System.currentTimeMillis()
|
||||
|
||||
println "第【${rowIndex}】次中匹配成功的:"+successCount+" 个,耗时:"+ (end - start)+" "+ DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")
|
||||
@@ -502,6 +500,8 @@ class DataStandardBatch extends BaseBatch{
|
||||
type = 12;//区域不同
|
||||
district = null;
|
||||
}else{
|
||||
def score = CosineSimilarAlgorithm.getSimilarity(district.name, copyObj.name)
|
||||
district.score = score //此处用来做测试
|
||||
type=15
|
||||
}
|
||||
}
|
||||
@@ -922,7 +922,7 @@ class DataStandardBatch extends BaseBatch{
|
||||
qdata.put("s_date", SHORT_DATE)
|
||||
// qdata.put("city","北京")
|
||||
// qdata.put("source","安居客")
|
||||
// qdata.put("name",Pattern.compile("金隅澜湾.*"))
|
||||
// qdata.put("name",Pattern.compile("龚家宅.*"))
|
||||
qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false));
|
||||
def ret = []
|
||||
try{
|
||||
@@ -1065,6 +1065,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
udata2.put("match_region", district.region);
|
||||
udata2.put("match_name", district.name);
|
||||
udata2.put("match_address", district.address);
|
||||
if(district.score){
|
||||
udata2.put("score", district.score);
|
||||
}
|
||||
udata2.put("avg_price", data.avg_price);
|
||||
udata2.put("type", type);
|
||||
udata2.put("tid", data._id.toString());
|
||||
|
||||
Reference in New Issue
Block a user