From a8cba2def2b841393efa4df1cf2772b77a3449d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Mon, 12 Apr 2021 11:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Es=E9=A9=B1=E5=8A=A8=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/util/ElasticUtils.groovy | 3 +- .../com/fangjia/script/util/HouseUtils.groovy | 14 ++- .../fangjia/script/wenyan/temp/Test.groovy | 94 +++++++++---------- 3 files changed, 54 insertions(+), 57 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy index 62c388a22..408763cfd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy @@ -140,13 +140,12 @@ class ElasticUtils { * @return */ static closeBulkProcessor(BulkProcessor bulkProcessor) { - bulkProcessor.awaitClose(10, TimeUnit.DAYS) bulkProcessor.flush() bulkProcessor.close() - } + static executeQuery(String host, String indexName, QueryBuilder qb, Closure closure){ RestHighLevelClient client = getClient(host) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/HouseUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/HouseUtils.groovy index 441f4bd9a..c403b9d8c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/HouseUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/HouseUtils.groovy @@ -1,19 +1,17 @@ package com.fangjia.script.util -import com.mongodb.DBCursor -import org.apache.commons.lang.StringUtils -import org.apache.lucene.index.Term -import org.apache.lucene.search.BooleanClause -import org.apache.lucene.search.BooleanQuery -import org.apache.lucene.search.TermQuery -import org.apache.solr.client.solrj.util.ClientUtils - import com.fangjia.datastore.driver.DSCursor import com.fangjia.datastore.driver.FacetResult import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DbUtils import com.mongodb.BasicDBObject import com.mongodb.DBObject +import org.apache.commons.lang.StringUtils +import org.apache.lucene.index.Term +import org.apache.lucene.search.BooleanClause +import org.apache.lucene.search.BooleanQuery +import org.apache.lucene.search.TermQuery +import org.apache.solr.client.solrj.util.ClientUtils class HouseUtils{ static main(args){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test.groovy index 8c05b9c5a..f64572b09 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test.groovy @@ -153,55 +153,55 @@ import org.apache.commons.lang3.StringUtils //} DBCollection BAIDUMAP_BORDER_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap_border", "192.168.0.206", 27020) -BAIDUMAP_BORDER_COLL.find(new BasicDBObject("baidu_border", null)).each {BasicDBObject dbo-> - def border = dbo.getString("border").replace("1-", "").replace(";", "").split(",") as List - def coords = [] - def baidu_points = [] - def gaode_points = [] - for(int i=0; i < border.size() - 1; i=i+2){ - coords << "${border[i]},${border[i+1]}" - if(coords.size() > 50){ - def json=BaiDuApiUtils.geoconv(coords.join(";"), 6, 5) - for(JSONObject it : json.result){ - baidu_points << "${it.x},${it.y}" - def geo = GeocodeUtils.geoconvBaiduToGoogle(it.x, it.y) - gaode_points << "${DataUtil.roundDouble(geo.lng, 6)},${DataUtil.roundDouble(geo.lat,6)}" - } - coords.clear() - } - } - if(coords.size() > 0){ - def json=BaiDuApiUtils.geoconv(coords.join(";"), 6, 5) - for(JSONObject it : json.result){ - baidu_points << "${it.x},${it.y}" - def geo = GeocodeUtils.geoconvBaiduToGoogle(it.x, it.y) - gaode_points << "${DataUtil.roundDouble(geo.lng, 6)},${DataUtil.roundDouble(geo.lat,6)}" - } - } - dbo.format_city = RegionData.formatCity(dbo.city) - dbo.baidu_border = baidu_points.join(";") - dbo.gaode_border = gaode_points.join(";") - BAIDUMAP_BORDER_COLL.save(dbo) - println(dbo) -} - -//ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\人口测试数据.xlsx",{List item-> -// def seaweed = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(item["B"], item["C"], item["D"]), new BasicDBObject("alias", 1).append("lng",1).append("lat", 1)) -// if(seaweed){ -// item["A"] = seaweed._id.toString() -// def names = [item['D']] -// if(seaweed.alias){ -// names.addAll(seaweed.alias) +//BAIDUMAP_BORDER_COLL.find(new BasicDBObject("baidu_border", null)).each {BasicDBObject dbo-> +// def border = dbo.getString("border").replace("1-", "").replace(";", "").split(",") as List +// def coords = [] +// def baidu_points = [] +// def gaode_points = [] +// for(int i=0; i < border.size() - 1; i=i+2){ +// coords << "${border[i]},${border[i+1]}" +// if(coords.size() > 50){ +// def json=BaiDuApiUtils.geoconv(coords.join(";"), 6, 5) +// for(JSONObject it : json.result){ +// baidu_points << "${it.x},${it.y}" +// def geo = GeocodeUtils.geoconvBaiduToGoogle(it.x, it.y) +// gaode_points << "${DataUtil.roundDouble(geo.lng, 6)},${DataUtil.roundDouble(geo.lat,6)}" +// } +// coords.clear() // } -// names.unique() +// } +// if(coords.size() > 0){ +// def json=BaiDuApiUtils.geoconv(coords.join(";"), 6, 5) +// for(JSONObject it : json.result){ +// baidu_points << "${it.x},${it.y}" +// def geo = GeocodeUtils.geoconvBaiduToGoogle(it.x, it.y) +// gaode_points << "${DataUtil.roundDouble(geo.lng, 6)},${DataUtil.roundDouble(geo.lat,6)}" +// } +// } +// dbo.format_city = RegionData.formatCity(dbo.city) +// dbo.baidu_border = baidu_points.join(";") +// dbo.gaode_border = gaode_points.join(";") +// BAIDUMAP_BORDER_COLL.save(dbo) +// println(dbo) +//} + +ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\小区群像测试数据.xlsx",{List item-> + def seaweed = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(item["B"], item["C"], item["D"]), new BasicDBObject("alias", 1).append("lng",1).append("lat", 1)) + if(seaweed){ +// item["A"] = seaweed._id.toString() + def names = [item['D']] + if(seaweed.alias){ + names.addAll(seaweed.alias) + } + names.unique() // if(seaweed.lng){ // item["G"] = DataUtil.roundDouble(seaweed.lng/10000000000d, 6) // item["H"] = DataUtil.roundDouble(seaweed.lat/10000000000d, 6) // } -// def one = BAIDUMAP_BORDER_COLL.findOne(new BasicDBObject("format_city", item["B"]).append("format_region", item["C"]).append("name", new BasicDBObject('$in', names))) -// if(one){ -// item["I"] = one.baidu_border -// } -// println(item) -// } -//}) \ No newline at end of file + def one = BAIDUMAP_BORDER_COLL.findOne(new BasicDBObject("format_city", item["B"]).append("format_region", item["C"]).append("name", new BasicDBObject('$in', names))) + if(one){ + item["I"] = one.gaode_border + } + println(item) + } +}) \ No newline at end of file