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 32a919245..b6b171c81 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 @@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2023-01-25", "2023-02-21") + def prices = CcbCommonUtils.findPersonPrice(city, "2023-01-25", "2023-02-23") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) @@ -85,7 +85,7 @@ class GuiDingPriceBatch extends BaseBatch{ saveToPgSql(rows) //更新静态数据表 - updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28") +// updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index 8aca6bac6..f0a1f1448 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -45,28 +45,28 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) -def citys = ["山南","黄南州","甘南","克孜勒苏","嘉峪关","海北州","阿拉善盟","怒江州","和田","日喀则","昌都","海南州","玉树州","吐鲁番","阿勒泰","三沙","塔城","甘孜州","果洛州","林芝","那曲","阿坝州","神农架"] -def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +//def citys = ["山南","黄南州","甘南","克孜勒苏","嘉峪关","海北州","阿拉善盟","怒江州","和田","日喀则","昌都","海南州","玉树州","吐鲁番","阿勒泰","三沙","塔城","甘孜州","果洛州","林芝","那曲","阿坝州","神农架"] +//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -ExcelUtils.multiThreadingModify("D:\\数据\\小区\\小区地址名单_估家科技V2 (3).xlsx",{d-> - if(d['J']){ - def cityId = cityCodeDataMap.get(d['H']) - def map = findCcbPriceCredit(sqlInstance236, cityId, d['J']) - println d['H'] +" "+d['J']+ map.toString() - if(map){ - d['Q'] = map.credit - d['R'] = map.month - d['U'] = map.price - } -// def thirdMap = findThirdPriceBySource(sqlInstance236, cityId, d['J']) -// if(thirdMap){ -// d['S'] = thirdMap.price -// d['T'] = thirdMap.month +//ExcelUtils.multiThreadingModify("D:\\数据\\小区\\小区地址名单_估家科技V2 (3).xlsx",{d-> +// if(d['J']){ +// def cityId = cityCodeDataMap.get(d['H']) +// def map = findCcbPriceCredit(sqlInstance236, cityId, d['J']) +// println d['H'] +" "+d['J']+ map.toString() +// if(map){ +// d['Q'] = map.credit +// d['R'] = map.month +// d['U'] = map.price // } - } - -}) +//// def thirdMap = findThirdPriceBySource(sqlInstance236, cityId, d['J']) +//// if(thirdMap){ +//// d['S'] = thirdMap.price +//// d['T'] = thirdMap.month +//// } +// } +// +//}) def findCcbPriceCredit(sqlInstance, cityid, commid){ def sql = "select * from (select CONFIDENCE,year_month,avg_price from community_base_price_gj where cityid='${cityid}' and commid='${commid}' order by year_month desc) WHERE ROWNUM <= 1" @@ -94,13 +94,13 @@ def findThirdPriceBySource(sqlInstance, cityid, commid){ -for(def c : citys){ - def cityCode = cityCodeDataMap.get(c) - println c +" "+cityCode - def priceDists = findAllPriceDist(sqlInstance236,cityCode, 202301) -// - checkNoPriceDist(sqlInstance236, priceDists, cityCode) -} +//for(def c : citys){ +// def cityCode = cityCodeDataMap.get(c) +// println c +" "+cityCode +// def priceDists = findAllPriceDist(sqlInstance236,cityCode, 202301) +//// +// checkNoPriceDist(sqlInstance236, priceDists, cityCode) +//} def checkNoPriceDist(sqlInstance236,priceDists, cityid){ def commids = [] @@ -1170,15 +1170,15 @@ def findThirdCommCount(cityid, sqlInstance){ //} -//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\国信达价格-杭州.xlsx" -//ExcelUtils.multiThreadingModify(fileName, { d -> -// def dist = CommonDatautils.findDistrictById(d['A']) -// if(dist){ -// d['C'] = dist.city -// d['D'] = dist.region -// d['E'] = dist.name -// } -//}) +def fileName = "D:\\数据\\建行\\房产估值\\指导价\\无价格小区(1).xlsx" +ExcelUtils.multiThreadingModify(fileName, { d -> + def dist = CommonDatautils.findDistrictById(d['A']) + if(dist){ + d['G'] = dist.city + d['H'] = dist.region + d['I'] = dist.name + } +}) //def fileName = "D:\\数据\\建行\\房产估值\\指导价\\0922入库数据.xlsx" //def datas = ExcelUtils.read(fileName, 0, 1) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy index 70a2a1041..ffa8a5b46 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -519,6 +519,7 @@ class ExportPgsqlBaseEvaluation { "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and data_udt_tm>=to_date('${publishDate}','yyyy-MM-dd')"; allRows = getHouseDatas(sql) } + println city +" "+allRows.size() if(allRows.size()>0){ index = index + 1 if(index == 1){ @@ -549,7 +550,6 @@ class ExportPgsqlBaseEvaluation { def index = 0 pgsqlInstance.eachRow(sql,{r-> index = index+1 - println r.urbn_nm +" "+index def data = [] data << r.urbn_id data << r.gujia_sell_id