From 95023fd052fa11ace73bbeb51dc7b3e6a57a80df Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 22 Aug 2022 15:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9=20es?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../script/gj/NoHouseDistrictStatBatch.groovy | 16 +++++++++------- .../script/gj/paimai/PaimaiDataSend.groovy | 12 ++++++------ 3 files changed, 16 insertions(+), 14 deletions(-) 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 08e507af9..6838e8e0a 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-06-1", "2022-07-21") + def prices = CcbCommonUtils.findPersonPrice(city, "2022-07-22", "2022-08-21") 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/NoHouseDistrictStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/NoHouseDistrictStatBatch.groovy index be975fe6e..276235d1d 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 @@ -5,6 +5,7 @@ import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection @@ -25,14 +26,15 @@ class NoHouseDistrictStatBatch extends BaseBatch{ 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) - public static 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" - public static EsDataSource dataSource = new EsDataSource() +// public static 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" + public static EsDataSource dataSource = null static { - dataSource.setUrl(address) - Properties connectionProperties = new Properties() - connectionProperties.put("user", "developer") - connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") - dataSource.setProperties(connectionProperties) + dataSource = ElasticUtils.getEsDataSource("seawater.es.db.fangjia.com") +// dataSource.setUrl(address) +// Properties connectionProperties = new Properties() +// connectionProperties.put("user", "developer") +// connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") +// dataSource.setProperties(connectionProperties) } public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) 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 7a314a59c..4f5343c14 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 @@ -35,12 +35,12 @@ class PaimaiDataSend { def task = new PaimaiDataSend() // task.jdRun() // task.aliZcRun() -// task.aliZcRun2() + task.aliZcRun2() // task.aliFpRun() // task.rmfysszcRun() // task.checkUrl() - task.paimaiSendToEs() +// task.paimaiSendToEs() } @@ -197,8 +197,8 @@ class PaimaiDataSend { def aliFpRun(){ def index = 0 def q = new BasicDBObject() - q.put("city","宿迁") - q.put("url","https://sf-item.taobao.com/sf_item/631616791778.htm") +// q.put("city","宿迁") + q.put("url","https://sf-item.taobao.com/sf_item/649014193736.htm") //https://sf-item.taobao.com/sf_item/657131607486.htm // q.put("parser_status", new BasicDBObject('$exists',false)) def dbcursor = ali_fp_coll.find(q).batchSize(2000) @@ -263,9 +263,9 @@ class PaimaiDataSend { def aliZcRun2(){ def index = 0 def q = new BasicDBObject() - q.put("city","宿迁") +// q.put("city","宿迁") // q.put("region","姑苏") -// q.put("url","https://zc-item.taobao.com/auction/670178084823.htm") + q.put("url","https://zc-item.taobao.com/auction/672615219601.htm") def dbcursor = ali_zc_coll.find(q).batchSize(1000) for(def d : dbcursor){ index++