Merge branch 'script_gj' into 'master'

update

See merge request !987
This commit is contained in:
2024-10-29 17:00:29 +08:00
2 changed files with 15 additions and 14 deletions
@@ -38,7 +38,7 @@ class RegionStandardBatch extends BaseBatch{
seaweedRegionStandardByCat("shop")
}
def poiRegionStandard(){
def citys = ["三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德"]//CommonDatautils.findAllCity()
def citys = ["三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德","重庆"]//CommonDatautils.findAllCity()
for(def city : citys){
def data = fullCityMap.get(city)
@@ -200,7 +200,7 @@ class RegionStandardBatch extends BaseBatch{
def m = [:]
m.put(d.id, ["district":updateRegion])
results << m
if(results.size()%1==0){
if(results.size()%100==0){
updateRegionByEs(results)
results.clear()
}
@@ -210,7 +210,7 @@ class RegionStandardBatch extends BaseBatch{
def m = [:]
m.put(d.id, ["status":1])
results << m
if(results.size()%1==0){
if(results.size()%100==0){
updateRegionByEs(results)
results.clear()
}
@@ -220,10 +220,11 @@ class RegionStandardBatch extends BaseBatch{
}
}
if(results.size()%1>0){
if(results.size()>0){
updateRegionByEs(results)
results.clear()
}
println city +" 处理完成"
}
@@ -242,21 +242,21 @@ class ElasticUtils89 {
String scrollId = searchResponse.getScrollId();
SearchHit[] searchHits = searchResponse.getHits().getHits();
def results = []
// while (searchHits != null && searchHits.length > 0) {
while (searchHits != null && searchHits.length > 0) {
for (int k=0; k < searchHits.size(); k++) {
SearchHit searchHit = searchHits[k]
searchHit.getSourceAsMap().put("id", searchHit.getId());
results << searchHit.getSourceAsMap()
}
// if(results.size()%100000==0){
// println "."+ new Date()
// }
// SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
// scrollRequest.scroll(scroll);
// searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT);
// scrollId = searchResponse.getScrollId();
// searchHits = searchResponse.getHits().getHits();
// }
if(results.size()%100000==0){
println "."+ new Date()
}
SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
scrollRequest.scroll(scroll);
searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT);
scrollId = searchResponse.getScrollId();
searchHits = searchResponse.getHits().getHits();
}
ClearScrollRequest clearScrollRequest = new ClearScrollRequest();
clearScrollRequest.addScrollId(scrollId);
client.clearScroll(clearScrollRequest, RequestOptions.DEFAULT);