From a9dca1f0d8f1041b402cb068bc342bdfe15e5b9f Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 21 Apr 2025 13:13:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy | 3 +-- .../com/fangjia/script/linxsh/util/AddressUtil.groovy | 2 +- .../script/yinjihaun/batch/ApiProductFieldStatBatch.groovy | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index d1696dd94..be5714bfd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -50,8 +50,7 @@ class CcbCommonUtils { public static def sqlInstance = null - public static def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", - "postgres", "postgres", "org.postgresql.Driver") + public static def pgsqlInstance = null //Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse","postgres", "postgres", "org.postgresql.Driver") public static def getRunningCitys(def args){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy index 61cc61f88..5da7fc52d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy @@ -55,7 +55,7 @@ class AddressUtil { * 初始化城市数据 */ static def initCityMap() { - Mongo mongo = new Mongo("mongo.db.fangjia.com", 27017); + Mongo mongo = new Mongo("mongo.db.fangjia.com", 28017); DBCollection SERVER_AREA = mongo.getDB("fangjia").getCollection("server_area"); DBCursor cursor = SERVER_AREA.find(new BasicDBObject(), new BasicDBObject("display", 1).append("city_grade", 1)); for(DBObject dbObject : cursor) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy index 026ec703f..6f2735f65 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy @@ -51,11 +51,11 @@ class ApiProductFieldStatBatch extends BaseBatch { //成交数据 static final DBCollection deal_price_coll = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") //中介 - static final DBCollection agency_mount_level_coll = MongoUtils.getCollectionByName("fangjia_stat", "pds.agency_mount_level", "mongo.db.fangjia.com", 27017) + static final DBCollection agency_mount_level_coll = MongoUtils.getCollectionByName("fangjia_stat", "pds.agency_mount_level", "mongo.db.fangjia.com", 28017) //租金 - static final DBCollection district_stat_rent_coll = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com", 27017) + static final DBCollection district_stat_rent_coll = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com", 28017) //城市 - static final DBCollection server_area_coll = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) + static final DBCollection server_area_coll = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 28017) //poi static final DBCollection district_nearby_coll = MongoUtils.getCollectionByName("fangjia", "district_nearby", "mongo.db.fangjia.com") From 8605feeb855e137fc65a97a886e23745f07b04e8 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 21 Apr 2025 14:32:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=88=AB=E5=90=8D=E6=94=B9=E4=B8=BA=E5=88=AB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 7bd1a3cdb..db468a556 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 @@ -250,7 +250,7 @@ class SeaweedDataSynch extends BaseBatch{ } def updating(city, cat){ - def dists = CommonDatautils.findAllDistrictsFromMg(city, cat, ["city","region","name","address","block","mapping_alias","addr_alias","cat","estate_type2","status","township","lng","lat","build_type","household_count","committee","estate_charge","car_site_count","property_life","house_property","build_area","all_area","build_structure","developer","estate_company","cubage_percent","virescence_percent","loudong_count","schools","main_type","main_type_area","create_year"]) + def dists = CommonDatautils.findAllDistrictsFromMg(city, cat, ["city","region","name","address","block","alias","addr_alias","cat","estate_type2","status","township","lng","lat","build_type","household_count","committee","estate_charge","car_site_count","property_life","house_property","build_area","all_area","build_structure","developer","estate_company","cubage_percent","virescence_percent","loudong_count","schools","main_type","main_type_area","create_year"]) def rets = new CopyOnWriteArrayList() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(dists.size()) @@ -351,9 +351,9 @@ class SeaweedDataSynch extends BaseBatch{ map.name = dist.name map.address = dist.address map.block = dist.block - if(dist.mapping_alias){ + if(dist.alias){ def aliasNames = [] - for(def key : dist.mapping_alias){ + for(def key : dist.alias){ if(key && !key.toString().equals("null")){ aliasNames << key // if(aliasNames.size()>5){