From d49c9078453afd98f2464e2290230b19b24e2dd6 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 21 Mar 2022 22:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E7=AD=91=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccbevaluation/DistrictGuidePriceBatch.groovy | 2 +- .../script/ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../com/fangjia/script/gj/ccb/CcbCodeUtils.groovy | 13 ++++++++----- .../script/gj/paimai/BeiKeCrawlByChrome.groovy | 2 +- .../script/gj/paimai/LianjiaCrawlByChrome.groovy | 6 +++--- .../thirdPriceCrawl/SynchDistrictPrice.groovy | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy index f67de27ae..94741174c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DistrictGuidePriceBatch.groovy @@ -25,7 +25,7 @@ class DistrictGuidePriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findGuidePrice(city, "2022-02-1", "2022-03-1") + def prices = CcbCommonUtils.findGuidePrice(city, "2022-03-1", "2022-04-1") if(prices){ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index 2f6bdef80..412677ae5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -44,7 +44,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2022-02-1", "2022-03-1") + def prices = CcbCommonUtils.findPersonPrice(city, "2022-03-1", "2022-04-1") if(prices){ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy index 9557d9c92..1dabf3ada 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy @@ -62,12 +62,12 @@ class CcbCodeUtils { return null } -// 高层塔楼 0101 增加“超高层” 0108 -// 高层板楼 0102 增加“老洋房” 0109 +// 高层塔楼 0101 增加“超高层” 0109 +// 高层板楼 0102 增加“老洋房” 0113 // 小高层板楼 0103 增加“花园洋房” 0110 // 多层板楼 0104 增加“四合院” 0111 // 独栋别墅 0105 增加“老式别墅洋房” 0112 -// 联排别墅 0106 +// 联排别墅 0106 增加“双拼别墅” 0108 // 叠拼别墅 0107 // 其他建筑形式 0199 @@ -84,7 +84,10 @@ class CcbCodeUtils { types << "0110" } if(buildType.contains("老洋房")){ - types << "0109" + types << "0113" + } + if(buildType.contains("双拼")){ + types << "0108" } if(buildType.contains("叠拼")){ types << "0107" @@ -99,7 +102,7 @@ class CcbCodeUtils { types << "0104" } if(buildType.contains("超高层")){ - types << "0108" + types << "0109" } if(buildType.contains("小高层")){ types << "0103" 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 dadbf4926..aa3cb1328 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 @@ -342,7 +342,7 @@ public class BeiKeCrawlByChrome { if(cityEles){ for(def e : cityEles){ def href = e.attr("href") - if(e.text().contains("天津")){ + if(e.text().contains("南京")){ cityMap.put(e.text(), "https:"+href) } } 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 e10306939..fca2a5eff 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 @@ -34,9 +34,9 @@ public class LianjiaCrawlByChrome { static main(args) { def task = new LianjiaCrawlByChrome(); - task.run() +// task.run() // task.run1() -// task.addDealRegion(); + task.addDealRegion(); // task.standardRegion() } @@ -109,7 +109,7 @@ public class LianjiaCrawlByChrome { def standardRegion(){ def q = new BasicDBObject() - q.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern("2022-01-01","yyyy-MM-dd"))) + q.put("trade_date", new BasicDBObject(QueryOperators.GTE, DateUtils.parseFromTightByPattern("2022-02-01","yyyy-MM-dd"))) q.put("match_id", new BasicDBObject(QueryOperators.EXISTS, false) ) def dbcursor = DEAL_PRICE_COLL.find(q) for(def d : dbcursor){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy index 3bcad4e62..1ce2d438f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy @@ -26,7 +26,7 @@ class SynchDistrictPrice { def run(){ - def citys = ["乌鲁木齐"]//CommonUtils.findAllCity() + def citys = CommonUtils.findAllCity() sourceMap.each { k, v -> for(def city : citys){