From d1a821af0cf1a06ada7d2a854e8ca8db78e8da5d Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 9 Apr 2025 09:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SynchAdministrativeMappingDataBatch.groovy | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy index 5b09c47a3..00b912a8c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/SynchAdministrativeMappingDataBatch.groovy @@ -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") + } + } }