From a5c125d85520922a0daddc664122c0d06a764898 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 11 Dec 2023 15:46:54 +0800 Subject: [PATCH] update --- .../script/commData/CommonDatautils.groovy | 27 +++++++++++++++++++ .../fuzhou/DistrictSellStatBatch.groovy | 6 +++-- .../script/gj/xiamen/SeaweedDataSynch.groovy | 4 +-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index 4cdb35aa8..d1fc40694 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -97,6 +97,7 @@ class CommonDatautils { public static final DBCollection SEAWEED_CONN = MongoUtils.getCollectionByName2("fangjia", "seaweed", MONGO100_URL) public static final DBCollection administrative_division_100_CONN = MongoUtils.getCollectionByName2("fangjia", "administrative_division", MONGO100_URL) + public static final DBCollection SEAWEED_MONGO_COLL = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com") static def DIRECTIONS = ["东北", "西北", "东南", "西南", "南北", "东西", "东", "南", "西", "北"] private static final HashMap> FITMENTS_TYPES_MAPS = new HashMap>() @@ -4311,5 +4312,31 @@ class CommonDatautils { } + public static def findAllDistrictByCity(def city, def cat, def fields){ + + DBObject q = new BasicDBObject(); + q.put("status",0) + q.put("cat", cat); + q.put("city", city); + + DBObject keys = new BasicDBObject(); + if(fields){ + for(def field : fields){ + keys.put(field, 1); + } + } + def dbsour = SEAWEED_MONGO_COLL.find(q,keys).batchSize(2000) + def rets = [] + + def ids = [] + for(def d : dbsour){ + rets << d + } + println "[${city}] 小区量:"+rets.size() + return rets; + } + + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy index d88fa4037..0b6a136ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy @@ -32,6 +32,8 @@ class DistrictSellStatBatch extends BaseBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static final DBCollection SEAWEED_MONGO_COLL = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com") + public static void main(String[] args) { runBatch(new DistrictSellStatBatch(), args); @@ -90,10 +92,10 @@ class DistrictSellStatBatch extends BaseBatch { def q = new BasicDBObject("city", city).append("cat", "district").append("status", 0) // q.put("name", "翠园楼") if(day == 2){ - districts = DbUtils.seaweed.find(q, keys).batchSize(2000) + districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000) }else{ q.put("m_date", new BasicDBObject('$gte',startMDate).append('$lt', endMDate)) - districts = DbUtils.seaweed.find(q, keys).batchSize(2000) + districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy index 50e68d9e9..cacc276d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy @@ -58,14 +58,14 @@ class SeaweedDataSynch extends BaseBatch{ public void process(Object args) { -// run() + run() // println "全国district, shop, office同步完成" //民政部编码上传 //codeRun() //println "民政部省,市,区同步完成" //println new ObjectId("622c433afb459ab08fdab460").getDate() - addTest() +// addTest() } def addTest(){