diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 2b61cb696..ee869ba86 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -543,6 +543,18 @@ 1.18.2 + + org.apache.commons + commons-text + 1.9 + + + + com.hankcs.hanlp.restful + hanlp-restful + 0.0.12 + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy index 1f2b994d6..bf662b6ea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/ClickHouseDistrictStatMarkupCalcBatch.groovy @@ -21,7 +21,7 @@ import java.sql.DriverManager @BatchOwner(Watcher.WangWenYan) class ClickHouseDistrictStatMarkupCalcBatch extends BaseBatch { - DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 27017) + DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo", 27017) static void main(String[] args) { runBatch(new ClickHouseDistrictStatMarkupCalcBatch(), args) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy index 099982429..32afa22f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ana/DistrictStatMarkupCalcBatch.groovy @@ -18,7 +18,7 @@ import com.mongodb.DBCollection @BatchOwner(Watcher.WangWenYan) class DistrictStatMarkupCalcBatch extends BaseBatch { - DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 27017) + DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) Date oneYearAgo = DateUtil.add(new Date(), Calendar.MONTH, -1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy index 4b9781f02..d96e0da05 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy @@ -8,8 +8,10 @@ import com.mongodb.DBCollection /** * 深圳公众号成交数据录入 */ + def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\2025年01月深圳二手房成交的.xlsx", 0, 1) -def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + +def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) //没有成交时间,随机生成 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy index d3df8510d..195dc1183 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPriceSample.groovy @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicLong */ class AddThirdPriceSample { - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static final DBCollection NO_PRICE_DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia_crawl", "deal_price_all", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index f6baf3541..77f92137f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -43,7 +43,7 @@ class BigdataDealBatch extends BaseBatch{ DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy index eaef4e568..a7681d9f0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictDelete.groovy @@ -45,7 +45,7 @@ class DistrictDelete { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new DistrictDelete() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index ffd743d5c..b17f2aae6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -27,7 +27,7 @@ class ThirdPartyPriceBatch extends BaseBatch { def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 // def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") def sourceMap = ["诸葛找房":"01", "安居客":"02","房天下":"03","链家":"04","城市家居":"05","麦田":"06","贝壳":"07", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy index c2caf475f..73c6676eb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy @@ -36,7 +36,7 @@ class TradeStatLog { def pssqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", "postgres", "postgres", "org.postgresql.Driver") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy index be649cf9d..f23121d0c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/ExcelDataTest.groovy @@ -18,10 +18,10 @@ import com.mongodb.QueryOperators import groovy.sql.Sql -DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") -DBCollection CITY_STAT = MongoUtils.getCollectionByName("fangjia_stat", "city_stat", "192.168.0.43") -DBCollection CITY_INFO = MongoUtils.getCollectionByName("fangjia_data_ana", "city_info", "192.168.0.43") -DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") +DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") +DBCollection CITY_STAT = MongoUtils.getCollectionByName("fangjia_stat", "city_stat", "mongo.db.fangjia.com") +DBCollection CITY_INFO = MongoUtils.getCollectionByName("fangjia_data_ana", "city_info", "mongo.db.fangjia.com") +DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy index 167fda35a..903a4b107 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy @@ -12,7 +12,7 @@ class MatchDealPriceRegion { static DBCollection collection = MongoUtils.getCollectionByName("fangjia_craw", "third_party_price", "192.168.0.235", 27018) - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy index e45fc62c6..06213a708 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/BlankEvaluationBatch.groovy @@ -21,7 +21,7 @@ import org.apache.lucene.queryparser.classic.QueryParser */ class EvaluationBatch { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy index 66f7dd391..7f992095b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy @@ -18,7 +18,7 @@ class FumingTest { def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")) //202302 def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", "postgres", "postgres", "org.postgresql.Driver") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy index 25560ff03..55cf2b8dd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy @@ -38,7 +38,7 @@ class HailanTest { } static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy index 42aedde30..3d8bc3152 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocStat.groovy @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicLong class PocStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection HOUSE_LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", lineUrl) public static final DBCollection LOUDONG_LINE_COLL = MongoUtils.getCollectionByName2("fangjia_base", "loudong", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy index 2d862b119..c067c7694 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy @@ -15,7 +15,7 @@ class RuiFenPocTest { def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")) //202302 def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", "postgres", "postgres", "org.postgresql.Driver") 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 952f3eccd..17a82f2fc 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 @@ -99,7 +99,7 @@ class CommonDatautils { } public static final DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community", "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009") - public static final DBCollection ADMINISTRATIVE_MAPPING_COLL = MongoUtils.getCollectionByName("business", "administrative_mapping", "mongo.db.fangjia.com") + public static final DBCollection ADMINISTRATIVE_MAPPING_COLL = MongoUtils.getCollectionByName("business", "administrative_mapping", "mongo.db.fangjia.com", 28017) public static final DBCollection OPERATION_LOG_COLL = MongoUtils.getCollectionByName("fangjia", "operation_log", "mongo.db.fangjia.com") public static final DBCollection STATS_INDEX_COLL = MongoUtils.getCollectionByName("fangjia_stat", "stats_index", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy index 86ebec035..34d890e67 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/FewerHouseDistrictCrawlCommandBatch.groovy @@ -23,7 +23,7 @@ import org.apache.commons.lang.StringUtils class FewerHouseDistrictCrawlCommandBatch extends BaseBatch { private static final DBCollection ARTEMIS_COLL = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com") - DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") + DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") static void main(String[] args) { runBatch(new FewerHouseDistrictCrawlCommandBatch(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/Test_weilei.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/Test_weilei.groovy index 68c1dc184..d569dba6d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/Test_weilei.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/crawl/Test_weilei.groovy @@ -15,7 +15,7 @@ import org.bson.types.ObjectId //new FewerHouseDistrictCrawlCommandBatch().process(null); //return; // -//DBCollection col_43_artemis_message = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "192.168.0.43", 27017); +//DBCollection col_43_artemis_message = MongoUtils.getCollectionByName("fangjia_log", "artemis_message", "mongo.db.fangjia.com", 27017); //DBCursor cursor_artemis_message = col_43_artemis_message.find(new BasicDBObject("status", 0)); //int count = 0; //while(cursor_artemis_message.hasNext()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy index 590386984..6f6512322 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DistrictTradeHouseStatBatch.groovy @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit @BatchOwner(Watcher.GaoJuan) class DistrictTradeHouseStatBatch extends BaseBatch{ - public static DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") - public static DBCollection DISTRICT_TRADE_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_trade_stat", "192.168.0.43") + public static DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") + public static DBCollection DISTRICT_TRADE_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_trade_stat", "mongo.db.fangjia.com") static main(args) { runBatch(new DistrictTradeHouseStatBatch(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/SynchDealPriceToEs.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/SynchDealPriceToEs.groovy index dba4650b9..e85220e8e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/SynchDealPriceToEs.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/SynchDealPriceToEs.groovy @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentType */ @BatchOwner(Watcher.GaoJuan) class SynchDealPriceToEs extends BaseBatch{ - static DBCollection dealPriceConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43",28017) + static DBCollection dealPriceConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com",28017) static main(args) { runBatch(new SynchDealPriceToEs(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy index f1f8918e6..459c68770 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy @@ -20,7 +20,7 @@ class AbcEvaluationRowsBatch extends BaseBatch{ static final def fjtSqlInstance = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?&characterEncoding=utf8", "sa", "G00jia", "com.mysql.jdbc.Driver"); - public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", dbUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy index 377a7a6c0..d49b696f3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy @@ -29,7 +29,7 @@ class DistrictInfoExportBatch extends BaseBatch{ def charset = "GBK" - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection FZ_ADDR_COLL = MongoUtils.getCollectionByName2("business", "fz_district_address", lineUrl) public static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName2("business", "fz_district", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy index 585e7bc0b..d049deab9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy @@ -23,7 +23,7 @@ class FzDataResultStat { public static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName2("business", "fz_district", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy index b0ce64f12..2fc6f160d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy @@ -16,7 +16,7 @@ import net.sf.json.JSONObject import org.apache.commons.io.FileUtils import org.bson.types.ObjectId -DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") +DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") import com.fangjia.core.util.HttpRequest diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index f96bf753a..f391d5dad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -169,7 +169,7 @@ DingDingMessageUtil.sendTextMessage(access_token, s) // // //def count(name, sDate){ -// DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") +// DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") // def q = new BasicDBObject() // q.put("city","福州") // q.put("s_date", sDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy index 11d76c586..fb6631ba3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy @@ -21,7 +21,7 @@ class ThirdPriceExportBatch extends BaseBatch{ def sDate= Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy index 22604b2ec..57b9f852c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdTest.groovy @@ -16,7 +16,7 @@ import java.util.concurrent.CountDownLatch class ThirdTest { - DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy index cd6252fb6..94efbb6df 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/TradeExportBatch.groovy @@ -25,7 +25,7 @@ class TradeExportBatch extends BaseBatch{ def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") + DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") static def districtMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy index a7ba664d1..599ef8f1e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CzBankStat.groovy @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger class CzBankStat { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("business", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("business", "average_statistics", "mongo.db.fangjia.com") def static final DBCollection CZLOG = MongoUtils.getCollectionByName("fangjia_log", "cz_log2", "192.168.0.136") static main(args) { def task = new CzBankStat(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy index 493c42d8c..c6ce91e86 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DealPriceProcess.groovy @@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils import java.util.regex.Pattern class DealPriceProcess { - final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") + final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") def total = 0 static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy index a38cf6268..8fccafde8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/DistrictDetailBatch.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.Executors class DistrictDetailBatch { - public static DBCollection DISTRICT_DETAIL_COLL = MongoUtils.getCollectionByName("fangjia_youfang", "district_detail", "192.168.0.43") + public static DBCollection DISTRICT_DETAIL_COLL = MongoUtils.getCollectionByName("fangjia_youfang", "district_detail", "mongo.db.fangjia.com") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy index da0c07889..9d7c97533 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy @@ -40,7 +40,7 @@ class EsHouseStat { dataSource.setProperties(connectionProperties) } - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) public static void main(String[] args){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy index 6c33b2553..423764526 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZDataExport.groovy @@ -16,8 +16,8 @@ import java.sql.ResultSet class FZDataExport { - final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static EsDataSource dataSource = new EsDataSource() private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy index 11123e02b..6e5a99f52 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FZHouseEvaluation.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCollection class FZHouseEvaluation { - public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", dbUrl) def regionMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjwUserStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjwUserStat.groovy index 5f73a32b9..a941d08e9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjwUserStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FjwUserStat.groovy @@ -8,7 +8,7 @@ import com.mongodb.DBCollection class FjwUserStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection USER_COLL = MongoUtils.getCollectionByName2("fangjia_coresite", "user", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy index 1ffbaa246..a337263f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/HouseLouDongMatchBatch.groovy @@ -18,7 +18,7 @@ import org.bson.Document; import org.bson.conversions.Bson; class HouseLouDongMatch { - public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", dbUrl) public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy index 29bd4df02..e153f90b6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy @@ -22,7 +22,7 @@ class LandDetailCrawl { DBCollection LAND_COLL = MongoUtils.getCollectionByName("fangjia_crawl", "land_deal_price1", "192.168.0.235", 27018) - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection FJT_LAND_COLL = MongoUtils.getCollectionByName2("business", "land_distinct", lineUrl) public static final DBCollection OFF_FJT_LAND_COLL = MongoUtils.getCollectionByName2("business", "land_distinct", offlineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy index 7c62d7229..b99f162e1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy @@ -14,10 +14,10 @@ import org.apache.lucene.queryparser.classic.QueryParser class LogStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def static final DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new LogStat() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy index 276235d1d..7f1f0b25b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy @@ -21,8 +21,8 @@ import java.util.concurrent.Executors @BatchOwner(Watcher.GaoJuan) class NoHouseDistrictStatBatch extends BaseBatch{ - public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; -// public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; +// public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_stat", dbUrl) public static final DBCollection AVERAGER_CONFIG_COLL = MongoUtils.getCollectionByName2("fangjia", "averager_config", dbUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy index 77c705569..e0e481909 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PingAnAddressLevalTest.groovy @@ -13,7 +13,7 @@ class PingAnAddressLevalTest { String token = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; - DBCollection DIST_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_grade", "192.168.0.43") + DBCollection DIST_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_grade", "mongo.db.fangjia.com") static main(args) { def task = new PingAnAddressLevalTest() task.run(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy index 30c9481ef..62ae568e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat.groovy @@ -329,7 +329,7 @@ def findDistrictPrice(def city, def region){ q.put("region", region); } //districtStatConn.addOption(Bytes.QUERYOPTION_SLAVEOK); - final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@192.168.0.43:28017","fangjia_stat", "district_stat"); + final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017","fangjia_stat", "district_stat"); def count = districtStatConn.count(q) return count; } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy index 67e127805..eb85734e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/QinLingStat1.groovy @@ -343,7 +343,7 @@ def findDistrictPrice(def city, def region){ q.put("region", region); } //districtStatConn.addOption(Bytes.QUERYOPTION_SLAVEOK); - final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@192.168.0.43:28017","fangjia_stat", "district_stat"); + final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017","fangjia_stat", "district_stat"); def count = districtStatConn.count(q) return count; } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy index 92b2a9409..937c82184 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/RegionBlockSetting.groovy @@ -6,7 +6,7 @@ import com.mongodb.DBCollection class RegionBlockSetting { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName2("fangjia", "region_block", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SynchDistrictStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SynchDistrictStatBatch.groovy index 1cd14588a..d0f6320d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SynchDistrictStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/SynchDistrictStatBatch.groovy @@ -17,8 +17,8 @@ import com.mongodb.DBObject class SynchDistrictStatBatch extends BaseBatch{ - //public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + //public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 28017) + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_stat", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateThirdPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateThirdPrice.groovy index b9147952a..2b7e1049e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateThirdPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/UpdateThirdPrice.groovy @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicLong class UpdateThirdPrice { - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def static final DBCollection AVERAGE_STATISTICS_OFFLINE = CrawalDBUtil.getAverage_statistics_col(); public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy index 16063d88b..4ca121052 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/apiLog/ApiUserCountAnalyBatch.groovy @@ -14,7 +14,7 @@ import groovy.sql.Sql class ApiUserCountAnalyBatch extends BaseBatch{ static final dbFangjia = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia?autoReconnect=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver"); - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection AUTHORITY_COLL = MongoUtils.getCollectionByName2("fangjia", "authority.api_user_authority", lineUrl) DBCollection VISIT_COLL = MongoUtils.getCollectionByName2("business", "api_visit_count", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy index 19709dd22..7ea251213 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCityPriceStat.groovy @@ -10,7 +10,7 @@ import com.mongodb.DBCollection class CcbCityPriceStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy index 27ea14198..08e1d9fb5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqin/PocTest2023.groovy @@ -20,7 +20,7 @@ import com.mongodb.DBCollection */ class PocTest2023 { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection paimai43_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", "pai_mai", lineUrl) public static final DBCollection DISTRICT_ANALY_DATA_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy index ddcfd51fc..d0e32b227 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DistrictSelectHouse.groovy @@ -15,7 +15,7 @@ import org.apache.commons.lang.math.RandomUtils class DistrictSelectHouse { DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new DistrictSelectHouse(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy index e252654d5..952d0033a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/TestPrice.groovy @@ -9,8 +9,8 @@ import com.mongodb.QueryOperators class TestPrice { - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy index 7ecf720df..26b2fa122 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/city/CityStatExport.groovy @@ -17,7 +17,7 @@ import org.elasticsearch.index.query.QueryBuilders class CityStatExport { - final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") + final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_stat", dbUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy index fad0c6bd1..0ddc8afec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/CityStat.groovy @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicLong class CityStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_stat", lineUrl) public static final DBCollection BAD_CASE_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "bad_case", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy index bd2f0760b..aadcddc6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/commStat/DataStatTest.groovy @@ -21,13 +21,13 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong -def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; +def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) DBCollection paimai43_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", "pai_mai", lineUrl) ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) -DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") +DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") -DBCollection region_stat_coll = MongoUtils.getCollectionByName("fangjia", "region_stat", "192.168.0.43") +DBCollection region_stat_coll = MongoUtils.getCollectionByName("fangjia", "region_stat", "mongo.db.fangjia.com") DBCollection mca_administrative_division_coll = MongoUtils.getCollectionByName("crawl", "mca_administrative_division_2022", "192.168.0.206", 27020) //def citys = ["乌鲁木齐","昌吉","阿克苏","伊犁","喀什"] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/BestDistrictPriceExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/BestDistrictPriceExport.groovy index 607d63378..69fe7a5be 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/BestDistrictPriceExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/BestDistrictPriceExport.groovy @@ -11,7 +11,7 @@ import com.mongodb.QueryOperators class BestDistrictPriceExport { DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new BestDistrictPriceExport(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy index 01b7a0338..99b05841f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy @@ -5,10 +5,8 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -import com.rabbitmq.client.impl.AMQImpl import java.util.regex.Pattern - /** * 名录集 */ @@ -34,6 +32,7 @@ class MinglujiData { def prov = "江苏省" def city = "无锡" exportDatas(city) +// exportDatas(city) // matchDev(prov, city) // matchCommunity(city) // fiveLevelSplit(city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy index 9608aee85..e6a6feaa8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionStandardBatch.groovy @@ -4,9 +4,12 @@ import com.fangjia.core.RegionData import com.fangjia.script.BaseBatch import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.xiamen.ElasticUtils89 +import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject import org.apache.commons.io.FileUtils +import org.bson.types.ObjectId import org.elasticsearch.action.bulk.BulkRequest import org.elasticsearch.action.update.UpdateRequest import org.elasticsearch.client.RequestOptions @@ -33,10 +36,14 @@ class RegionStandardBatch extends BaseBatch{ void process(Object args) { seaweedRegionStandard() // poiRegionStandard() +// seaweedRegionStandard() +// poiRegionStandard() + //通过乡镇街道修改区域 如:东莞市 +// updateRegionByTown() } def seaweedRegionStandard(){ - seaweedRegionStandardByCat("district") + seaweedRegionStandardByCat("office") } def poiRegionStandard(){ @@ -93,7 +100,7 @@ class RegionStandardBatch extends BaseBatch{ def seaweedRegionStandardByCat(cat){ - def citys = CommonDatautils.findAllCity() + def citys = ["伊春"]//CommonDatautils.findAllCity() for(def city : citys){ def rMap = regionMap.get(city) @@ -148,8 +155,12 @@ class RegionStandardBatch extends BaseBatch{ def streetMap = CommonDatautils.queryAllStreetNameByCity(fullCityName) if(streetMap){ set = streetMap.keySet() - def districts = CommonDatautils.findAllDistricts(city, cat, ["city","region","name"]) + def districts = CommonDatautils.findAllDistricts(city, cat, ["city","region","name","lng","lat"]) + println city +" "+ districts.size() + def index = 0 for(def d : districts){ + index ++ + println index +" "+ d.region if(set.contains(d.region)){ continue } @@ -157,8 +168,12 @@ class RegionStandardBatch extends BaseBatch{ def updateRegion = null def flag = null for(def key : set){ - def alias = streetMap.get(key) - if((alias && alias.contains(d.region)) || (!alias && key.contains(d.region))){ + def obj = streetMap.get(key) + def alias = null + if(obj && obj.alias){ + alias = obj.alias + } + if((alias && alias.contains(d.region)) || (!alias && key==d.region)){ def newRegion = RegionData.formatRegion(d.city, key) if(newRegion!=d.region){ updateRegion = newRegion @@ -166,13 +181,26 @@ class RegionStandardBatch extends BaseBatch{ flag = "pass" break; } + + if(obj.shape){ + def inAreaFlag = InsidePolygon.isInArea(d.lng/10000000000.0, d.lat/10000000000.0, InsidePolygon.createPoint4(obj.shape.coordinates)) + if(inAreaFlag){ + def newRegion = obj.street + newRegion = RegionData.formatRegion(d.city, newRegion) + if(newRegion!=d.region){ + updateRegion = newRegion + } + flag = "pass" + break; + } + } } if(updateRegion){ def udata = new BasicDBObject() udata.put("region", updateRegion) udata.put("m_date", new Date()) println d.city +" "+d.region+" "+d.name +" 区域修改为:"+updateRegion -// DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) + DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata)) }else{ if(flag!="pass"){ def udata = new BasicDBObject() @@ -402,4 +430,27 @@ class RegionStandardBatch extends BaseBatch{ return rets; } + def updateRegionByTown(){ + ExcelUtils.modify("d:\\数据\\城市与区域相同写字楼.xlsx",{d-> + def town = RegionData.formatRegion(d['B'], d['F']) + if(town){ + + def obj = CommonDatautils.findDistrict(d['B'], town, d['E'], "office") + if(!obj){ + def udata = new BasicDBObject() + udata.put("region", town) + udata.put("m_date", new Date()) + println d['F']+" "+" 区域修改为:" + town + DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d['A'])), new BasicDBObject('$set', udata)) + }else{ + def udata = new BasicDBObject() + udata.put("m_date", new Date()) + udata.put("status", 1) + println d['F']+" "+" 删除:" + town + DbUtils.seaweed.update(new BasicDBObject("_id", new ObjectId(d['A'])), new BasicDBObject('$set', udata)) + } + + } + }) + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy index 6fce88fa6..748447212 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/RegionUpdateBatch.groovy @@ -16,7 +16,7 @@ class RegionUpdateBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new RegionUpdateBatch() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy index b5f4ceb7f..c3d0bf761 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TempExportData.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.gj.data_handle +import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils @@ -219,34 +220,41 @@ class TempExportData { } def exportOfficeHouseCount(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\写字楼\\待核实写字楼.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\数据\\高德写字楼-房源第三方验证.xlsx",{d-> // def obj = findYuanQu(d['B'], d['D']) // if(obj){ // d['T'] = "前瞻存在" // } // if(!d['T']){ -// def obj = findYuanQu(d['B'], d['D']) +// def city = RegionData.formatCity(d['C']) +// def obj = findYuanQu(city, d['E']) // if(obj){ +// d['T'] = "前瞻存在" // d['U'] = obj.name // } // } // if(!d['T']) { -// def count = findHouseCountByCat(d['B'], d['C'], d['D'], "office_sell") +// def city = RegionData.formatCity(d['C']) +// def region = RegionData.formatRegion(city, d['D']) +// +// def count = findHouseCountByCat(city, region, d['E'], "office_sell") // if (!count) { -// count = findHouseCountByCat(d['B'], d['C'], d['D'], "office_rent") +// count = findHouseCountByCat(city, region, d['E'], "office_rent") // } -// d['S'] = count +// d['T'] = count // } - if(!d['J']){ - def datas = CommonDatautils.findThirdNetWorkOffices(d['B'], d['C'], d['D']) + if(!d['T']){ + def city = RegionData.formatCity(d['C']) + def region = RegionData.formatRegion(city, d['D']) + def datas = CommonDatautils.findThirdNetWorkOffices(city, region, d['E']) if(datas){ def sources = [] for(def o : datas){ sources << o.source } if(sources){ - d['K'] = sources.join(",") + d['V'] = sources.join(",") } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy index 3f08229ce..1d22f4cc3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/Test.groovy @@ -1,58 +1,57 @@ package com.fangjia.script.gj.data_handle -import com.fangjia.script.commData.CommonDatautils -import com.fangjia.script.util.DateUtils -import com.fangjia.script.util.ExcelUtils -import com.fangjia.script.util.MongoUtils -import com.mongodb.BasicDBObject -import com.mongodb.DBCollection -import org.apache.commons.lang.math.RandomUtils - -def mongoDbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; -DBCollection REGION_STAT_COLL = MongoUtils.getCollectionByName2("fangjia", "region_stat", mongoDbUrl) - - -def city = "昌江" -ExcelUtils.modify("D:\\数据\\海南\\海南省城市均价.xlsx",{d-> - def date = d['B'] - def start = DateUtils.getFirstDayOfMonth(date) - def end = DateUtils.getLastDayOfMonth(date) - def weekends = DateUtils.getWeekendBetweenDates(start, end) - for(def weekend : weekends){ - def avg_price = d['I'] - def val = random(-200,200) - def new_price = (int)(avg_price*val/10000 + avg_price) - def last_weekend = DateUtils.add(DateUtils.formatDateByPattern(weekend, "yyyy-MM-dd"), -7) - def last_price = CommonDatautils.queryCityPriceByWeekend(city, last_weekend) - - def o = new BasicDBObject() - o.put("avg_price", new_price) - o.put("c_date" , new Date()) - o.put("city", city) - o.put("m_date" , new Date()) - o.put("weekend", weekend) - o.put("cat","城市") - o.put("moving_average" , (int)avg_price) - if(!last_price){ - o.put("weekend_markup" , 0) - }else{ - def weekend_markup = (int)((new_price-last_price)*100/last_price) - o.put("weekend_markup" , weekend_markup) - } - - def q = new BasicDBObject("cat", "城市").append("city", city).append("weekend", weekend) - REGION_STAT_COLL.update(q, new BasicDBObject('$set', o),true, false) - } -},1) - - -public static final int random(int i1, int i2) { - int max = Math.max(i1, i2); - int min = Math.min(i1, i2); - return min + RandomUtils.nextInt(max - min + 1); -} - - +import org.bson.types.ObjectId +ObjectId objectId = new ObjectId("659c9ae92ae7732fd7d54e40"); +Date creationDate = objectId.getDate(); +System.out.println(creationDate); +//def mongoDbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; +//DBCollection REGION_STAT_COLL = MongoUtils.getCollectionByName2("fangjia", "region_stat", mongoDbUrl) +// +// +//def city = "昌江" +//ExcelUtils.modify("D:\\数据\\海南\\海南省城市均价.xlsx",{d-> +// def date = d['B'] +// def start = DateUtils.getFirstDayOfMonth(date) +// def end = DateUtils.getLastDayOfMonth(date) +// def weekends = DateUtils.getWeekendBetweenDates(start, end) +// for(def weekend : weekends){ +// def avg_price = d['I'] +// def val = random(-200,200) +// def new_price = (int)(avg_price*val/10000 + avg_price) +// def last_weekend = DateUtils.add(DateUtils.formatDateByPattern(weekend, "yyyy-MM-dd"), -7) +// def last_price = CommonDatautils.queryCityPriceByWeekend(city, last_weekend) +// +// def o = new BasicDBObject() +// o.put("avg_price", new_price) +// o.put("c_date" , new Date()) +// o.put("city", city) +// o.put("m_date" , new Date()) +// o.put("weekend", weekend) +// o.put("cat","城市") +// o.put("moving_average" , (int)avg_price) +// if(!last_price){ +// o.put("weekend_markup" , 0) +// }else{ +// def weekend_markup = (int)((new_price-last_price)*100/last_price) +// o.put("weekend_markup" , weekend_markup) +// } +// +// def q = new BasicDBObject("cat", "城市").append("city", city).append("weekend", weekend) +// REGION_STAT_COLL.update(q, new BasicDBObject('$set', o),true, false) +// } +//},1) +// +// +//public static final int random(int i1, int i2) { +// int max = Math.max(i1, i2); +// int min = Math.min(i1, i2); +// return min + RandomUtils.nextInt(max - min + 1); +//} +// +// +// +// +// diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy index f799e6651..31105176e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownMiddleProcess.groovy @@ -3,23 +3,22 @@ package com.fangjia.script.gj.data_handle import com.fangjia.core.RegionData import com.fangjia.core.util.BaiDuApiUtils import com.fangjia.core.util.GeocodeUtils +import com.fangjia.core.util.HttpRequest import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.util.BaiduMapUtils -import com.fangjia.script.util.DataUtil import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.ProvinceData import com.mongodb.AggregationOutput import com.mongodb.BasicDBObject +import com.mongodb.Bytes import com.mongodb.DBCollection import com.mongodb.DBObject -import com.mongodb.client.AggregateIterable -import org.bson.Document +import net.sf.json.JSONObject import org.bson.types.ObjectId import java.util.regex.Pattern - /** * 乡镇街道中间表 * 包含市,区,乡镇街道别名,来源 统计局community表 @@ -45,6 +44,8 @@ class TownMiddleProcess { DBCollection DEVELOPMENT_ZONE_43_COLL = MongoUtils.getCollectionByName("fangjia_base", "development_zone", "mongo.db.fangjia.com") + static DBCollection POLYLINECOLL2025 = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline_2025") + def fullCityMap = CommonDatautils.queryFullNameCity() static main(args) { @@ -96,6 +97,12 @@ class TownMiddleProcess { // checkCenterInTownRang()//检测乡镇街道中心点是否在围栏中 // addSpecialCityTownAlias() + + +// updateNewRegionPoyline()//更新新的区域围栏 + + updateMappingPolyline() + } @@ -681,7 +688,7 @@ class TownMiddleProcess { } def regionPolyline(){ - def dbcursor = REGIONPOLYLINE_COLL.find(new BasicDBObject("level","district")) + def dbcursor = POLYLINECOLL2025.find(new BasicDBObject("level","district")) def map = [:] for(def d : dbcursor){ def resultMap = [:] @@ -1356,4 +1363,90 @@ class TownMiddleProcess { keys.put("street", 1) return ADMINISTRATIVE_MAPPING_COLL.find(q, keys).toList() } + + def updateNewRegionPoyline(){ + + def regionPolylineMap = regionPolyline() + def q = new BasicDBObject() + q.put("type","区域") +// q.put("city", "苏州市") + def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) + for(def d : dbcursor){ + def shapeData = regionPolylineMap.get(d.city+"|@|"+d.district) + println d.city+" "+d.district + if(shapeData){ + println "新围栏数:"+shapeData.shape.coordinates.size() + } + + if(d.shape){ + println "旧围栏数:"+d.shape.coordinates.size() + } + + if(d.shape && shapeData && shapeData.shape!=d.shape){ + def udata = new BasicDBObject() + udata.shape = shapeData.shape + udata.location = shapeData.location + udata.m_date = new Date() + ADMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",d._id), new BasicDBObject('$set',udata)) +// if(shapeData && d.shape && shapeData.shape.type=="polygon" && d.shape.type=="polygon"){ +// double area = com.fangjia.script.util.GeoHelper.calculateArea(shapeData.shape.coordinates[0]) +// double area1 = com.fangjia.script.util.GeoHelper.calculateArea(d.shape.coordinates[0]) +// if(Math.abs(area1-area)>=1){ +// println "新:"+area +// println "旧:"+area1 +// def udata = new BasicDBObject() +// udata.shape = shapeData.shape +// udata.location = shapeData.location +// //DMINISTRATIVE_MAPPING_COLL.update(new BasicDBObject("_id",d._id), new BasicDBObject('$set',udata)) +// } +// } + } + } + } + + def updateMappingPolyline(){ + def q = new BasicDBObject() + q.put("type","区域") + q.put("shape.type","polygon") + def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q) + for(def d : dbcursor){ + updateAdministrativeMapping(d._id.toString(), d.shape) + } + } + + + def updateAdministrativeMapping(def id, def shape){ + def header = [:] + header["Authorization"] = "Basic ${Base64.getEncoder().encodeToString("elastic:elasticsearch".getBytes("UTF-8"))}".toString() + String seawaterUrl = "http://192.168.0.89:9200/administrative_mapping/_update_by_query?conflicts=proceed&scroll_size=1000&wait_for_completion=false" + def body = """ + { + "script": { + "source": "ctx._source.shape = params.newshape", + "params":{ + "newshape":{ + "type":"${shape.type}", + "coordinates":${shape.coordinates} + } + } + }, + "query": { + "term": { + "_id": "${id}" + } + } + } + """ + HttpRequest request = new HttpRequest() + try{ + String res = request.postWithBody(seawaterUrl, JSONObject.fromObject(body.toString()), header, "UTF-8") + def response = JSONObject.fromObject(res) + println(response) + }catch(Exception e){ + println "error : "+e.getMessage() + } + + } + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy index 0d458ec18..3797a3924 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy @@ -31,7 +31,6 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong - /** * 区域标准化 * 1.小区库乡镇街道标准化,包含小区,商铺,写字楼 @@ -629,7 +628,7 @@ class TownStandardBatch extends BaseBatch{ // //通过调取地图api接口获取乡镇街道 // if(!saveObj.township){ -// def gaodeMap = BaiduMapUtils.geocoding(location.lat+","+location.lon) + def gaodeMap = BaiduMapUtils.geocoding(location.lat+","+location.lon) // if(gaodeMap && gaodeMap.addressComponent) { // def addressComponent = gaodeMap.addressComponent // if(addressComponent){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index b69e526a4..fd1066677 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -1,16 +1,9 @@ package com.fangjia.script.gj.district import com.fangjia.core.util.HttpRequest -import com.fangjia.script.addrepo.InvokeHttpRequest -import com.fangjia.script.statistics.poi.AmapPoi -import com.fangjia.script.temp.shenjian.util.GaoDeUtils import com.fangjia.script.temp.shenjian.util.HttpUtils -import com.fangjia.script.util.HttpRequestUtil -import com.mongodb.DBObject import net.sf.json.JSONArray import net.sf.json.JSONObject -import org.apache.commons.collections.CollectionUtils -import org.apache.commons.lang.StringUtils class FangjiaClientUtils { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy index 975d618ee..beabc5fd2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/PricePkTest.groovy @@ -9,7 +9,7 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; +def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def city = "常州" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy index 1b4bd8a80..d5d3956e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy @@ -14,7 +14,7 @@ import org.apache.lucene.queryparser.classic.QueryParser class EsMonthHouseStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy index 59b61a9e5..f37ffa535 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataDealBatch.groovy @@ -38,7 +38,7 @@ class FjwBigdataDealBatch extends BaseBatch{ DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy index 892ebfea5..c5f33716f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwThirdPartyPriceBatch.groovy @@ -29,7 +29,7 @@ class FjwThirdPartyPriceBatch extends BaseBatch { def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 // def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") def sourceMap = ["诸葛找房":"01", "安居客":"02","房天下":"03","链家":"04","城市家居":"05","麦田":"06","贝壳":"07", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy index 7a00efd46..da8902cab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/guangfa/GuangfaBlankSelectDistrict.groovy @@ -27,7 +27,7 @@ class GuangfaBlankSelectDistrict { public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; public static final DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new GuangfaBlankSelectDistrict(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy index 2003db863..62474f6c5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong public class BeiKeCrawlByChrome { def DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") WebDriver driver = null; @@ -118,7 +118,7 @@ public class BeiKeCrawlByChrome { } def crawlData(driver, citys){ - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def runedCitys = FileUtils.readTxt("d:\\数据\\成交抓取\\贝壳已抓城市.txt") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy index a458ccd56..b994d31e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/ExportPaimai.groovy @@ -15,7 +15,7 @@ import java.util.regex.Pattern class ExportPaimai { - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection paimai43_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", "pai_mai", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy index ec1ad4acd..1730f28b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong public class LianjiaCrawlByChrome { def DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") WebDriver driver = null; @@ -189,7 +189,7 @@ public class LianjiaCrawlByChrome { } def crawlData(driver, cityList){ - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) def runedCitys = FileUtils.readTxt("d:\\数据\\成交抓取\\链家已抓城市.txt") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy index cf4bed800..f457e323e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy @@ -28,7 +28,7 @@ class PaimaiDataSend { DBCollection jd_coll = MongoUtils.getCollectionByName("fangjia_crawl", "fapai_jd_detail", "192.168.0.235", 27018) DBCollection rmfysszc_coll = MongoUtils.getCollectionByName("fangjia_crawl", "fapai_rmfysszc_detail", "192.168.0.235", 27018) - def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; DBCollection paimai43_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", "pai_mai", lineUrl) public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy index 52add2e69..36ee62699 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy @@ -26,7 +26,7 @@ class PaimaiTest { DBCollection paimaiResultColl = MongoUtils.getCollectionByAuth20190102("fangjia", "pai_mai") - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection paimai43_COLL = MongoUtils.getCollectionByName2("fangjia_crawl", "pai_mai", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy index 2e27e41cc..9eaa268fc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy @@ -30,7 +30,7 @@ class AddPriceTest { def pgsqlInstance235 = Sql.newInstance("jdbc:postgresql://192.168.0.235:5433/fangjia?stringtype=unspecified", "postgres", "Goojia123456", "org.postgresql.Driver") - static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") public static final DBCollection confirm_price_date = MongoUtils.getCollectionByName("fangjia", "confirm_price_data", "mongo.db.fangjia.com") static main(args) { @@ -230,6 +230,8 @@ class AddPriceTest { if(newPriceMap){ d['G'] = newPriceMap.avg_price d['H'] = newPriceMap.month + d['H'] = map.calc_type +// d['AM'] = map.credit_value } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy index d4440f329..4633e64b4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ExportToDealPrice.groovy @@ -13,8 +13,8 @@ import java.util.concurrent.atomic.AtomicInteger class ExportToDealPrice { - DBCollection DEAL_PRICE_MATCH_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price_match", "192.168.0.43") - DBCollection DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") + DBCollection DEAL_PRICE_MATCH_COLL = MongoUtils.getCollectionByName("fangjia", "deal_price_match", "mongo.db.fangjia.com") + DBCollection DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") DBCollection TRADE_MATCH_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "trade_match_price", "192.168.0.136") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy index 976e008ba..5a8f83a8f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzBlankTest.groovy @@ -14,7 +14,7 @@ import java.util.regex.Pattern class FzBlankTest { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection FZ_ADDR_COLL = MongoUtils.getCollectionByName2("business", "fz_district_address", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy index 838fcbd20..63543c6b5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy @@ -20,7 +20,7 @@ import java.util.regex.Pattern class JiangShuBlankDataStat { - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new JiangShuBlankDataStat() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy index d7b18e371..531870d89 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/TestArroundPrice.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBCollection class TestArroundPrice { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DIST_DATA_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_analy_data", lineUrl) public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy index 967fa21ce..d7e5fe6fe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/township/StreetProcess.groovy @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicLong class StreetProcess { - final DBCollection TOWNSHIP = MongoUtils.getCollectionByName("fangjia", "township", "192.168.0.43") + final DBCollection TOWNSHIP = MongoUtils.getCollectionByName("fangjia", "township", "mongo.db.fangjia.com") public static final def MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; public static final DBCollection TOWNSHIP100 = MongoUtils.getCollectionByName2("fangjia", "township", MONGODB_URL) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy index bf848d990..627c30884 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/NetworkDistanceBatch.groovy @@ -27,9 +27,9 @@ class NetworkDistanceBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) - final DBCollection NETWORK_COLL = MongoUtils.getCollectionByName("business", "xm_network", "192.168.0.43") + final DBCollection NETWORK_COLL = MongoUtils.getCollectionByName("business", "xm_network", "mongo.db.fangjia.com") - final DBCollection MAP_NETWORK_COLL = MongoUtils.getCollectionByName("business", "xm_network_map", "192.168.0.43") + final DBCollection MAP_NETWORK_COLL = MongoUtils.getCollectionByName("business", "xm_network_map", "mongo.db.fangjia.com") static main(args) { runBatch(new NetworkDistanceBatch(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy index 4dc7c2384..43fd17c7d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/grade/ConsumptionRatingBatch.groovy @@ -20,10 +20,10 @@ import java.util.regex.Pattern class ConsumptionRatingBatch extends BaseBatch { def weekend = DateUtil.truncateDay(DateUtil.getFirstDayOfWeek(new Date())) public static - final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") + final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static - final DBCollection CONSUMPTION_GRADE_COLL = MongoUtils.getCollectionByName("fangjia_stat", "consumption_grade", "192.168.0.85") + final DBCollection CONSUMPTION_GRADE_COLL = MongoUtils.getCollectionByName("fangjia_stat", "consumption_grade", "mongo.db.fangjia.com") final DBCollection AMAP_POI_New_COLL = MongoUtils.getCollectionByName("m_dianping", "dianping_9", "114.80.150.196", 27777) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy index 05435c508..ededaa1db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/aliyun/AliyunSmsClient.groovy @@ -52,7 +52,7 @@ class AliyunSmsClient { } public static void main(String[] args) { - sendSms("13916076378", "SMS_135220034", '{"code":12345}') + sendSms("15021384995", "SMS_482915107", '{"code":12345}') } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy index 586237d04..e99c9b8c4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jusfoun/HousingTransactionExportBatch.groovy @@ -30,7 +30,7 @@ import java.sql.SQLException class HousingTransactionExportBatch extends BaseBatch { - final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") + final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") static DBCollection _db_esf_transaction = MongoUtils.getCollectionByName("vip_site", "esf_transaction", "192.168.0.235", 27018); static MongoCollection PAI_MAI = Mongo3Utils.getDbCollection(Constants.FANGJIA_MONGO_URI, "fangjia_crawl", "pai_mai") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy index 2a231a42c..22f0a1f93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/loudong/CqfdcMatch.groovy @@ -23,7 +23,7 @@ import java.util.regex.Pattern class CqfdcMatch { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection HOUSE_LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", lineUrl) static DBCollection loudongFdcConn = MongoUtils.getCollectionByName("fangjia_crawl", "loudong_cqfdc", "192.168.0.235", 27018) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy index 9bd28e7fd..e557d8799 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/GaodePOI2Baidu.groovy @@ -53,8 +53,8 @@ def pcmap = [:] provinceList.remove("广西省") provinceList.add("广西壮族自治区") -DSCollection seabird = new DataStore("192.168.0.43", 28017).getCollection("fangjia_base.baidu_place_poi2") -DBCollection m43 = MongoUtils.getCollectionByName("fangjia_base", "baidu_place_poi2", "192.168.0.43", 28017) +DSCollection seabird = new DataStore("mongo.db.fangjia.com", 28017).getCollection("fangjia_base.baidu_place_poi2") +DBCollection m43 = MongoUtils.getCollectionByName("fangjia_base", "baidu_place_poi2", "mongo.db.fangjia.com", 28017) //def type3Not = ["学校内部设施", "进港", "出港", "候船室", "住宿服务相关"] // //def type2Not = ["学校", "专科医院", "综合医院", "诊所", "银行", "自动提款机", "便民商店/便利店", "家电电子卖场", "超级市场", "商场", "美容美发店", "地铁站", "港口码头", "住宿服务"] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy index f5c0a94c6..5bfa86aee 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy @@ -16,9 +16,9 @@ import com.mongodb.DBCollection //@BatchOwner(Watcher.MaJinTao) class CommunityHouseSampleBatch extends BaseBatch { - DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) - DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) - DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "192.168.0.43", 28017) + DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com", 28017) + DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 28017) + DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "mongo.db.fangjia.com", 28017) DSCollection SEABIRD = new DataStore("seabird.db.fangjia.com").getCollection("fangjia.seabird") static void main(String[] args) { @@ -160,13 +160,13 @@ import com.mongodb.DBCollection @BatchOwner(Watcher.MaJinTao) class CommunityHouseSampleBatch extends BaseBatch { - DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) + DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com", 28017) - DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) + DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 28017) - DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "192.168.0.43", 28017) + DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "mongo.db.fangjia.com", 28017) -// DBCollection SEABIRD = MongoUtils.getCollectionByName("fangjia", "seabird", "192.168.0.43", 28017) +// DBCollection SEABIRD = MongoUtils.getCollectionByName("fangjia", "seabird", "1mongo.db.fangjia.com", 28017) DSCollection SEABIRD = new DataStore("seabird.db.fangjia.com").getCollection("fangjia.seabird") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/DistrictStatClickhouseSyncBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/DistrictStatClickhouseSyncBatch.groovy index 5ba702a2e..cb11ad4c7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/DistrictStatClickhouseSyncBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/DistrictStatClickhouseSyncBatch.groovy @@ -16,7 +16,7 @@ import java.sql.Statement @BatchOwner(Watcher.WangWenYan) class DistrictStatClickhouseSyncBatch extends BaseBatch{ - DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 27017) + DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) static void main(String[] args) { runBatch(new DistrictStatClickhouseSyncBatch(), args) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/DealPriceDetailExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/DealPriceDetailExport.groovy index 9f532247a..63cf10b20 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/DealPriceDetailExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/DealPriceDetailExport.groovy @@ -19,9 +19,9 @@ import java.util.concurrent.* class DealPriceDetailExport { // 小区均价集合 - static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 28017) // 小区成交集合 - static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43", 28017) + static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com", 28017) static final Map retMap = new ConcurrentHashMap() static ExecutorService executorService = Executors.newFixedThreadPool(10) static ExecutorService districtExecutorService = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15Export.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15Export.groovy index fb9b88402..2e0d4181a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15Export.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15Export.groovy @@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicInteger class PPE15Export { // 小区均价集合 - static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43",28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com",28017) // 小区成交集合 - static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43",28017) + static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com",28017) static Map retMap = new ConcurrentHashMap() static ExecutorService executorService = Executors.newFixedThreadPool(30) static ExecutorService districtExecutorService = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15ExportTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15ExportTest.groovy index 40a866be1..41d8a59b2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15ExportTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/PPE15ExportTest.groovy @@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicInteger class PPE15ExportTest { // 小区均价集合 - static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43",28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com",28017) // 小区成交集合 - static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43",28017) + static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com",28017) static Map retMap = new ConcurrentHashMap() static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/RentExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/RentExport.groovy index dbcf2139f..00b5638de 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/RentExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/RentExport.groovy @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger */ class RentExport { - static DBCollection collection = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "192.168.0.43",28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com",28017) static ExecutorService executorService = Executors.newFixedThreadPool(30) static Map retMap = new ConcurrentHashMap() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/TotalTestExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/TotalTestExport.groovy index b0e7a120e..316e602cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/TotalTestExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/TotalTestExport.groovy @@ -20,9 +20,9 @@ import java.util.concurrent.CountDownLatch class TotalTestExport { // 小区均价集合 - static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43",28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com",28017) // 小区成交集合 - static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43",28017) + static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com",28017) static Map retMap = new ConcurrentHashMap() // 在此更改时间 static final def TRADE_DATE_START = "2020-03-28" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/ValueRateCityInfoExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/ValueRateCityInfoExport.groovy index 82f000f52..c39dbc23d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/ValueRateCityInfoExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/ValueRateCityInfoExport.groovy @@ -20,9 +20,9 @@ import java.util.concurrent.CountDownLatch class ValueRateCityInfoExport { // 小区均价集合 - static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43",28017) + static DBCollection collection = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com",28017) // 小区成交集合 - static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43",28017) + static DBCollection fangjiaConn = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com",28017) static Map retMap = new ConcurrentHashMap() // 在此更改时间 static final def TRADE_DATE_START = "2020-03-28" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/business/BusinessDianpingExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/business/BusinessDianpingExport.groovy index 3f03c1c01..76d9104bd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/business/BusinessDianpingExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/business/BusinessDianpingExport.groovy @@ -16,7 +16,7 @@ import org.apache.commons.lang3.StringUtils class BusinessDianpingExport { static DBCollection collection = MongoUtils.getCollectionByName("fangjia_crawl", "business", "192.168.0.235", 27018) - static DBCollection cityCollection = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "192.168.0.43", 28017) + static DBCollection cityCollection = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com", 28017) static void main(String[] args) { def cityCodes = ["320500","610100","340100"]; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundExportByNewWay.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundExportByNewWay.groovy index 3bffc1300..be6b759e2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundExportByNewWay.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundExportByNewWay.groovy @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger */ class AroundExportByNewWay { - static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static def resultMap = new ConcurrentHashMap() static def unMatchedMap = new ConcurrentHashMap() static ExecutorService executorService = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundFormatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundFormatExport.groovy index 89b1c7b3c..2e5f11e3e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundFormatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/AroundFormatExport.groovy @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger */ class AroundFormatExport { - static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static def resultMap = new ConcurrentHashMap() static def unMatchedMap = new ConcurrentHashMap() static ExecutorService executorService = Executors.newFixedThreadPool(30) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/ImportSchool.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/ImportSchool.groovy index b8f0452ee..242dd4c63 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/ImportSchool.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/ImportSchool.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBObject */ class ImportSchool { - static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static void main(String[] args) { List> data = ExcelUtils.read("F:\\数据\\重庆农商行\\重庆学校_0902.xlsx", 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MarkUnNeedExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MarkUnNeedExport.groovy index 9ce164947..4c4cfcffc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MarkUnNeedExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MarkUnNeedExport.groovy @@ -16,7 +16,7 @@ import sun.swing.BakedArrayList */ class MarkUnNeedExport { - static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static void main(String[] args) { List> data = ExcelUtils.read("F:\\数据\\重庆农商行\\周边补充.xlsx", 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MoveArroundTemp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MoveArroundTemp.groovy index c641a4fc8..cceebeef6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MoveArroundTemp.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/MoveArroundTemp.groovy @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger class MoveArroundTemp { static DBCollection conn = MongoUtils.getCollectionByName("seeddb_dev", "arround_temp", "192.168.0.235", 27018) - static DBCollection conn43 = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection conn43 = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static ExecutorService executorService = Executors.newFixedThreadPool(30) static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy index 1c907e236..02fda673e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy @@ -16,7 +16,7 @@ import java.util.regex.Pattern */ class POIRule { - static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SavePoi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SavePoi.groovy index 40c42f36a..496be8386 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SavePoi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SavePoi.groovy @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger class SavePoi { static DBCollection conn = MongoUtils.getCollectionByName("seeddb_dev", "arround_temp", "192.168.0.235", 27018) - static DBCollection conn43 = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) + static DBCollection conn43 = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "mongo.db.fangjia.com", 28017) //3km范围内地铁站、公交站、银行、医院、商场、学校等名称及距离信息 static def types = "150500|1507|090100|090101|090200|090202|090203|090204|090205|090206|090207|090208|090209|090210|090211|1601|0601|141200|141201|141202|141203|141204" static def radius = 3000 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy index 9817c00cb..854052b17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy @@ -27,9 +27,9 @@ import java.util.concurrent.Executors */ class SeaweedExport { - static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "192.168.0.43", 28017) + static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com", 28017) static ExecutorService executorService = Executors.newFixedThreadPool(30) - static final DBCollection seaweed = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) + static final DBCollection seaweed = MongoUtils.getCollectionByName("fangjia", "seaweed", "mongo.db.fangjia.com", 28017) static def map = new ConcurrentHashMap() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/crawl/58/Seed58.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/crawl/58/Seed58.groovy index 79bf00e9a..0dab33e51 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/crawl/58/Seed58.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/crawl/58/Seed58.groovy @@ -15,7 +15,7 @@ import com.mongodb.DBObject class Seaweed58 { static DBCollection districtSeedsConn = MongoUtils.getCollectionByName("seeddb", "district_seeds", "192.168.0.235", 27018) - static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "192.168.0.43", 28017) + static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com", 28017) static void main(String[] args) { List list = cityMapConn.distinct("fangjia_city") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeGeoHash.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeGeoHash.groovy index 53b0679f0..60e5e17ce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeGeoHash.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeGeoHash.groovy @@ -18,7 +18,7 @@ import java.util.concurrent.Executors */ class CommitteeGeoHash { - static DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "192.168.0.43", 28017) + static DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "mongo.db.fangjia.com", 28017) static ExecutorService executorService = Executors.newFixedThreadPool(30) static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy index db1f5a13d..d83e43625 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy @@ -20,7 +20,7 @@ import java.util.concurrent.Executors */ class CommitteeLatLng { - static DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "192.168.0.43", 28017) + static DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "mongo.db.fangjia.com", 28017) static ExecutorService executorService = Executors.newFixedThreadPool(10) static void main(String[] args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetCodeFromExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetCodeFromExcel.groovy index f466ed3be..b190fbd0b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetCodeFromExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetCodeFromExcel.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBObject import org.apache.commons.collections.CollectionUtils import org.apache.commons.lang.StringUtils -final DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "192.168.0.43", 28017) +final DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "mongo.db.fangjia.com", 28017) /** * 获取省市区编码 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetTownshipFromExcel.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetTownshipFromExcel.groovy index c8481a44a..4a12ce369 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetTownshipFromExcel.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/GetTownshipFromExcel.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBObject import org.apache.commons.collections.CollectionUtils import org.apache.commons.lang.StringUtils -final DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "192.168.0.43", 28017) +final DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "mongo.db.fangjia.com", 28017) /** * 获取国家标准居委街道 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/CityUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/CityUtils.groovy index 2949d3803..c73026057 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/CityUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/CityUtils.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBCollection */ class CityUtils { - static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "192.168.0.43", 28017) + static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com", 28017) static listCitySet() { List list = cityMapConn.distinct("fangjia_city") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/SeaweedUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/SeaweedUtils.groovy index c17285a78..d843c3034 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/SeaweedUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/SeaweedUtils.groovy @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap */ class SeaweedUtils { - static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "192.168.0.43", 28017) + static DBCollection cityMapConn = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com", 28017) static def map = new ConcurrentHashMap() static getRegionByCode(def district_code) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy index 42972bc05..b0bde2dcf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy @@ -15,7 +15,7 @@ import org.apache.commons.codec.binary.Base64; class DataStat { def static final thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") static main(args) { def task = new DataStat(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestDistrict.groovy index aa6e24350..195136215 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestDistrict.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestDistrict.groovy @@ -12,7 +12,7 @@ import java.util.regex.Pattern class Test { - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43")//192.168.0.85 + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com")//192.168.0.85 def static final fieldMap = [ "房估估":"fanggugu_esf","诸葛找房":"zhugezhaofang_esf","安居客":"anjuke_esf","搜房":"soufang_esf","中原地产":"zhongyuan_esf","赶集":"ganji_esf", "链家":"lianjia_esf","兔博士":"tuboshi_esf","城市房产":"cityhouse_esf","贝壳找房":"beike_esf","Q房":"qfang_esf","Q房(新)":"qfang_new","中原地产(新)":"zhongyuan_new", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy index d1fb7dc6f..f903f3172 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy @@ -27,7 +27,7 @@ class ThirdDataToGatherBatch extends BaseBatch{ def static final DBCollection AVERAGE_STATISTICS_OFFLINE = CrawalDBUtil.getAverage_statistics_col(); //MongoUtils.getMongoDBByAuth().getCollection("average_statistics") // def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com",38888) - def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43")//192.168.0.85 + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com")//192.168.0.85 def static final fieldMap = [ "房估估":"fanggugu_esf","诸葛找房":"zhugezhaofang_esf","安居客":"anjuke_esf","搜房":"soufang_esf","中原地产":"zhongyuan_esf","赶集":"ganji_esf", "链家":"lianjia_esf","兔博士":"tuboshi_esf","城市房产":"cityhouse_esf","贝壳找房":"beike_esf","Q房":"qfang_esf","Q房(新)":"qfang_new","中原地产(新)":"zhongyuan_new", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy index 67858c081..e2e874695 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy @@ -12,7 +12,7 @@ import java.sql.ResultSet class TradeDealPriceStat { - DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") + DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") static def districtMap = [:] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/CosineSimilarAlgorithm.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/CosineSimilarAlgorithm.groovy index 3f12f1b79..300c1ea6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/CosineSimilarAlgorithm.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/CosineSimilarAlgorithm.groovy @@ -1,12 +1,28 @@ package com.fangjia.script.util +import com.hankcs.hanlp.restful.HanLPClient +import org.apache.commons.text.similarity.* +import org.apache.commons.text.similarity.JaroWinklerSimilarity + class CosineSimilarAlgorithm { + public static void main(String[] args){ - println CosineSimilarAlgorithm.getSimilarity("兰坪路301弄","兰坪路301弄12支弄,兰坪路301弄22支"); - println CosineSimilarAlgorithm.getSimilarity("兰坪路301弄12支弄,兰坪路301弄22支","兰坪路301弄"); - println CosineSimilarAlgorithm.getSimilarityRatio("江川路291号","江川路291弄") - println CosineSimilarAlgorithm.getSimilarityRatio("江川路291号","江川路290号"); + + def address1 = "市建四公司宿舍" + def address2 = "市建四公司小区" + + println "余弦相似:"+CosineSimilarAlgorithm.getSimilarity(address1, address2);//余弦相似 + println "编辑距离:"+CosineSimilarAlgorithm.levenshteinSimilarity(address1, address2);//编辑距离 + println "Jaro-Winkler 相似度:"+CosineSimilarAlgorithm.jaroWinklerSimilarity(address1, address2)//Jaro-Winkler 相似度 + println "综合相似:"+CosineSimilarAlgorithm.calculateSimilarity(address1, address2);//综合相似 + println "jaccard:"+CosineSimilarAlgorithm.jaccardSimilarity(address1, address2); + println "jaccard:"+CosineSimilarAlgorithm.jaccardSimilarity2(address1, address2); + +// def customTokenizer = { text -> text.split(" ").toSet() } +// +// def score2 = jaccardSimilarity(address1, address2, customTokenizer) +// println "按词语分割的Jaccard相似度: ${(score2 * 100).round(2)}%" } @@ -160,7 +176,73 @@ class CosineSimilarAlgorithm { public static float getSimilarityRatio(String str, String target) { return 1 - (float)compare(str, target)/Math.max(str.length(), target.length()); } - - + // 计算 Levenshtein 相似度 (基于编辑距离) + static def levenshteinSimilarity(String s1, String s2) { + def maxLength = Math.max(s1.size(), s2.size()) + if (maxLength == 0) return 1.0 + def lev = new LevenshteinDistance() + return 1 - (lev.apply(s1, s2) / maxLength) + } + + // 计算 Jaro-Winkler 相似度 + static def jaroWinklerSimilarity(String s1, String s2) { + def jw = new JaroWinklerSimilarity() + jw.apply(s1, s2) + } + + static def jaccardSimilarity(String str1, String str2, Closure tokenizer = null) { + // 默认分词逻辑:按字符分割为集合 + if (tokenizer == null) { + tokenizer = { text -> text.chars.collect { it as String } as Set } + } + + def set1 = tokenizer(str1) + def set2 = tokenizer(str2) + + // 处理空集合情况 + if (set1.isEmpty() && set2.isEmpty()) return 1.0 + if (set1.isEmpty() || set2.isEmpty()) return 0.0 + + def intersection = set1.intersect(set2).size() + def union = set1.size() + set2.size() - intersection + intersection / union as Double + } + + +// 综合相似度 (可调整权重) + static def calculateSimilarity(String s1, String s2) { + def levScore = levenshteinSimilarity(s1, s2) + def jwScore = jaroWinklerSimilarity(s1, s2) + // 加权平均 (Levenshtein 占40%, Jaro-Winkler 占60%) + (levScore * 0.4 + jwScore * 0.6).round(2) + } + + + static def jaccardSimilarity2(str1, str2) { + // 将字符串转换为字符集合 + def set1 = str1.chars.toSet() + def set2 = str2.chars.toSet() + + // 计算交集和并集 + def intersection = set1.intersect(set2).size() + def union = set1.size() + set2.size() - intersection + + // 计算Jaccard相似度 + def similarity = (double) intersection / union + + return similarity + } + + static def jaccardByChineseSegmentation(String str1, String str2) { + // 中文分词(需要HanLP依赖) + HanLPClient HanLP = new HanLPClient("https://www.hanlp.com/api", null); + def seg1 = HanLP.segment(str1).collect { it.word }.toSet() + def seg2 = HanLP.segment(str2).collect { it.word }.toSet() + + def intersection = seg1.intersect(seg2).size() + def union = seg1.size() + seg2.size() - intersection + + return union == 0 ? 0 : (double) intersection / union + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20181123.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20181123.groovy index 0519c71eb..6012d1cb0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20181123.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20181123.groovy @@ -8,7 +8,7 @@ import com.mongodb.BasicDBObject import com.mongodb.Bytes import com.mongodb.DBCollection -DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia", "district_stat", "192.168.0.43") +DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia", "district_stat", "mongo.db.fangjia.com") def query =new BasicDBObject(); query.put('weekend', DateUtils.parseFromTightYYYYMMDD("2018-11-18")); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190115.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190115.groovy index a77707ae6..2a6223d63 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190115.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190115.groovy @@ -11,7 +11,7 @@ import com.mongodb.DBCursor import com.mongodb.DBObject import org.apache.commons.lang.StringUtils -DBCollection DIST_SELL_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "192.168.0.43", 28017); +DBCollection DIST_SELL_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com", 28017); DBObject q = new BasicDBObject("city": "西宁"); q.put("date", 201812); //q.put("date", new BasicDBObject('gt', 201806).append('lte', 201812)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190121.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190121.groovy index 8c8aa0990..6158704c7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190121.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Daily/20190121.groovy @@ -13,7 +13,7 @@ import org.apache.commons.lang.StringUtils List> detailRows = new ArrayList>(); detailRows.add(["城市", "区域", "小区名", "可性度"]); -DBCollection DIST_SELL_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017); +DBCollection DIST_SELL_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 28017); DBObject q = new BasicDBObject(); //new BasicDBObject('city', new BasicDBObject('$in', ["常州", "苏州", "淮安"])) q.put("city", "淮安"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Test.groovy index 772e91d06..050ba67fb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/weilei/Test.groovy @@ -27,7 +27,7 @@ for (int i = 0; i < FangGuGuCrawl.accountUsers.size(); i++) { } return 1; -DBCollection col_district_stat_1 = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43"); +DBCollection col_district_stat_1 = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com"); DBCollection col_district_stat_2 = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.136", 27018); DBCollection col_district_stat_18 = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.18", 28018); DBCursor cursor = col_district_stat_1.find().sort(new BasicDBObject("weekend", -1)).batchSize(2000).addOption(Bytes.QUERYOPTION_NOTIMEOUT); @@ -76,7 +76,7 @@ println "End - " + count; //return; // // -//DBCollection col_guiding_price = MongoUtils.getCollectionByName("fangjia", "guiding_price", "192.168.0.43", 27017); +//DBCollection col_guiding_price = MongoUtils.getCollectionByName("fangjia", "guiding_price", "mongo.db.fangjia.com", 27017); // //DBCursor cursor = col_guiding_price.find(new BasicDBObject('$where' , "this.name == this.guiding_person")); //while(cursor.hasNext()){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/address/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/address/Test1.groovy index e67e057e5..47325a59c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/address/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/address/Test1.groovy @@ -12,7 +12,7 @@ import java.sql.Connection import java.sql.ResultSet import java.sql.Statement -//final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") +//final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") //def key = [] //int i =0 //DIST_STAT_COLL.find(new BasicDBObject("weekend", DateUtil.parseDate("20180826", "yyyyMMdd"))).batchSize(1000).each {def dbo-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/CityHousePrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/CityHousePrice.groovy index b260aa415..f1563a0bb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/CityHousePrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/CityHousePrice.groovy @@ -4,7 +4,7 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -DBCollection GUIDING_PRICE = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") +DBCollection GUIDING_PRICE = MongoUtils.getCollectionByName("fangjia", "average_statistics", "mongo.db.fangjia.com") def data = ExcelUtils.read("D:\\Users\\wenyan\\Desktop\\城市评估均价对比.xlsx", 1) long total = 0 int count = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DealPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DealPrice.groovy index d2ba9610a..9ee9d0379 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DealPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DealPrice.groovy @@ -20,7 +20,7 @@ import java.sql.Statement //Class.forName("ru.yandex.clickhouse.ClickHouseDriver"); //Connection connection = DriverManager.getConnection("jdbc:clickhouse://192.168.0.19:8123?max_memory_usage=50000000000") -//DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") +//DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") //DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery("上海"),{BasicDBObject district-> // def estate_type = "小区" // if(district.estate_type2.toString().contains("别墅")){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DistrictStatRepeatRemover.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DistrictStatRepeatRemover.groovy index 75b6728d1..f86633ef6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DistrictStatRepeatRemover.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DistrictStatRepeatRemover.groovy @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicLong // //def removeRepeatDistrictStat(city, region, name, estate_type){ -// DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") +// DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") // List stats = DISTRICT_STAT.find(new BasicDBObject("city", city).append("region", region).append("district_name", name).append("estate_type",estate_type)).toList() // def map = [:] // stats.each {BasicDBObject stat-> @@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicLong //}) -DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43") +DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") def keys = new BasicDBObject() keys.city = 1 keys.region = 1 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test13.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test13.groovy index 7961e4d15..4ac5450d7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test13.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test13.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBCollection import net.sf.json.JSONArray import net.sf.json.JSONObject -DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat_new", "192.168.0.43") +DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat_new", "mongo.db.fangjia.com") def trend(city, region, name, weekend, estate_type) { def cmd = new BasicDBObject() cmd.city = city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test14.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test14.groovy index 1c7fa0a2c..bcfff62f7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test14.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Test14.groovy @@ -11,7 +11,7 @@ import com.mongodb.Bytes import com.mongodb.DBCollection import net.sf.json.JSONObject -//DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 27017) +//DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com", 27017) //def int count =0 //ExcelUtils.multiThreadingModify("D:\\涨跌幅较大小区.xlsx",{ List item-> // def query = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Trend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Trend.groovy index 016d99b3d..af9993be3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Trend.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Trend.groovy @@ -10,7 +10,7 @@ import com.mongodb.Bytes import com.mongodb.DBCollection //def cities = ["北京", "上海", "广州","深圳","杭州","南京","武汉","成都","西安","长沙","南昌","贵阳","三亚"] -//DBCollection GUIDING_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") +//DBCollection GUIDING_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") //cities.each {def city-> // def one = GUIDING_PRICE.find(new BasicDBObject("city", city)).sort(new BasicDBObject("trade_date", 1)).limit(0)[0] // println(city + "\t" + ((Date)one.trade_date).format("yyyy")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/XingYe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/XingYe.groovy index 2ebfa4262..41c5483ab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/XingYe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/XingYe.groovy @@ -12,7 +12,7 @@ import java.sql.Connection import java.sql.ResultSet import java.sql.Statement -DBCollection DIST_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_grade", "192.168.0.43") +DBCollection DIST_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_grade", "mongo.db.fangjia.com") def String hasElevator(BasicDBObject seaweed){ EsDataSource dataSource = new EsDataSource() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/DealPriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/DealPriceStat.groovy index e53eec2b6..d0a3a74c2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/DealPriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/DealPriceStat.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection */ class DealPriceStat { - public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; + public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection deal_price_coll = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/DistrictRateStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/DistrictRateStat.groovy index 5236cc675..db03ae997 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/DistrictRateStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/DistrictRateStat.groovy @@ -330,7 +330,7 @@ def findDistrictPrice(def city, def region){ q.put("region", region); } //districtStatConn.addOption(Bytes.QUERYOPTION_SLAVEOK); - final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@192.168.0.43:28017","fangjia_stat", "district_stat"); + final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017","fangjia_stat", "district_stat"); def count = districtStatConn.count(q) return count; } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/QinLingStat1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/QinLingStat1.groovy index 8b49db263..7e9558e4a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/QinLingStat1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/price/QinLingStat1.groovy @@ -344,7 +344,7 @@ def findDistrictPrice(def city, def region){ q.put("region", region); } //districtStatConn.addOption(Bytes.QUERYOPTION_SLAVEOK); - final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@192.168.0.43:28017","fangjia_stat", "district_stat"); + final def districtStatConn = Mongo3Utils.getDbCollection("mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017","fangjia_stat", "district_stat"); def count = districtStatConn.count(q) return count; } \ No newline at end of file