Merge branch 'script_gj' into 'master'

测试

See merge request !1107
This commit is contained in:
2025-04-09 09:53:10 +08:00
@@ -9,6 +9,8 @@ import com.mongodb.DBCollection
import org.elasticsearch.index.query.QueryBuilder
import org.elasticsearch.index.query.QueryBuilders
import java.util.concurrent.CopyOnWriteArrayList
class SynchAdministrativeMappingDataBatch extends BaseBatch{
def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009";
DBCollection ADMINISTRATIVE_MAPPING_COLL_100 = MongoUtils.getCollectionByName2("fangjia", "administrative_mapping", MONGO100_URL)
@@ -50,20 +52,25 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{
return retMap;
}
def synchToEs(devMap, host){
def synchToEs(retMap, host){
QueryBuilder queryBuilder = QueryBuilders.boolQuery()
def oldIds = new CopyOnWriteArrayList()
ElasticUtils89.executeQuery(host, "administrative_mapping", queryBuilder, { String id, doc->
def mongoObj = devMap.get(id)
oldIds << id
def mongoObj = retMap.get(id)
def updateFieldCount = 0
mongoObj.each{k,v->
if(!["id","_id","c_date","m_date","polyline_source","operator"].contains(k)){
if(!["id","_id","c_date","m_date","polyline_source","operator","city_simple_pinyin","prefecture_level_city"].contains(k)){
def val = doc.get(k)
if(val!=v){
println doc.name +" 修改 "+id
// updateValMap.put(k,val)
updateFieldCount++
doc.put(k,v)
if(v.type!="MultiPolygon"){
println k +" 修改 "+id
updateFieldCount++
doc.put(k,v)
}
}
}
}
@@ -78,5 +85,22 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{
}
}
})
def addEsDatas = []
retMap.each{id,map->
if(!oldIds.contains(id)){
println "需新增:"+id
map.remove("c_date")
map.remove("m_date")
map.remove("polyline_source")
map.remove("operator")
addEsDatas << map
}
}
if(addEsDatas){
ElasticUtils89.updateEs(addEsDatas, host, "administrative_mapping")
}
}
}