From 27282f27814ce619ef7b5387584f57dbba90cf87 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 8 Aug 2024 16:40:10 +0800 Subject: [PATCH] test --- .../script/ccbevaluation/BigdataCommunityBatch.groovy | 10 ++++++---- .../fjwPriceBaseData/FjwBigdataCommunityBatch.groovy | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index 0ab948806..28f4f850f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -34,6 +34,8 @@ class BigdataCommunityBatch extends BaseBatch{ def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", "postgres", "postgres", "org.postgresql.Driver") + def fangjiaDists = new HashSet() + static main(args) { runBatch(new BigdataCommunityBatch(), args); } @@ -50,7 +52,6 @@ class BigdataCommunityBatch extends BaseBatch{ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 def today = new Date().getDate() - def fangjiaDists = [] println "starting 。。。。。。。。。" for(def city : citys){ @@ -64,6 +65,7 @@ class BigdataCommunityBatch extends BaseBatch{ for(def d : dists){ fangjiaDists << d._id.toString() } + println "加载建行小区量" def ccbMaps = null if(today<=10){ @@ -71,9 +73,9 @@ class BigdataCommunityBatch extends BaseBatch{ }else{ ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用 } - + println "组装新数据" def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) - rets = addDeleteDist(dists, ccbMaps, rets, fangjiaDists) + rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) println "[${index}] "+city +" 小区量:"+dists.size()+" 总:"+rets.size() @@ -106,7 +108,7 @@ class BigdataCommunityBatch extends BaseBatch{ } - def addDeleteDist(dists, ccbMaps, rets, fangjiaDists){ + def addDeleteDist(dists, ccbMaps, rets){ println "房价网小区:"+fangjiaDists.size()+" 建行小区:"+rets.size() def ccbDists = ccbMaps.keySet() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy index 575225b6b..0291a1e8c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataCommunityBatch.groovy @@ -53,13 +53,13 @@ class FjwBigdataCommunityBatch extends BaseBatch{ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 def today = new Date().getDate() - + def fangjiaDists = new HashSet() println "starting 。。。。。。。。。" for(def city : citys){ index ++ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"], "all") - def fangjiaDists = [] + for(def d : dists){ fangjiaDists << d._id.toString() }