From 27a18ce88d5a248cf3a4414844d558f780b75b21 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 21 Jun 2023 18:29:16 +0800 Subject: [PATCH] update --- .../ccbevaluation/BigdataDealBatch.groovy | 88 +++++++++---------- .../ccbevaluation/GuiDingPriceBatch.groovy | 4 +- .../fangjia/script/ccbevaluation/Test.groovy | 68 +++++++------- .../script/district/MasterNameInAlias.groovy | 18 ++-- 4 files changed, 89 insertions(+), 89 deletions(-) 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 4d289d469..249590993 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 @@ -66,51 +66,51 @@ class BigdataDealBatch extends BaseBatch{ curDate = args[1].toString().toInteger() } println "curDate:"+curDate - def allCitys = CommonDatautils.findAllCity() - for(def city : allCitys){ -// if(!ccbCitys.contains(city)){ - addDealPriceMatch(city); -// } +// def allCitys = CommonDatautils.findAllCity() +// for(def city : allCitys){ +//// if(!ccbCitys.contains(city)){ +// addDealPriceMatch(city); +//// } +// } + def rows = [] + def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + def index = 0 + for(def city : citys){ + index ++ + def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) + def ppeDists = [:] + + def statMap = [:]//getDistrictStatByCity(city, weekend) + if(city=="上海"){ + def youDataTrade = getYouDaData(statMap) + def youdaDatas = createData(youDataTrade, cityCodeDataMap, distCodeMap, "youda") + rows.addAll(youdaDatas) + println city +" "+youdaDatas.size() + } + + def trades = getCityData(city, statMap, ppeDists) + if(trades){ + def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") + rows.addAll(rets) + println "【${index}】"+city +" 成交共:"+rets.size() + + def cityDatas = [] + cityDatas << headers + cityDatas.addAll(rows) + } + } -// def rows = [] -// def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] -// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -// def index = 0 -// for(def city : citys){ -// index ++ -// def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) -// def ppeDists = [:] -// -// def statMap = [:]//getDistrictStatByCity(city, weekend) -// if(city=="上海"){ -// def youDataTrade = getYouDaData(statMap) -// def youdaDatas = createData(youDataTrade, cityCodeDataMap, distCodeMap, "youda") -// rows.addAll(youdaDatas) -// println city +" "+youdaDatas.size() -// } -// -// def trades = getCityData(city, statMap, ppeDists) -// if(trades){ -// def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") -// rows.addAll(rets) -// println "【${index}】"+city +" 成交共:"+rets.size() -// -// def cityDatas = [] -// cityDatas << headers -// cityDatas.addAll(rows) -// } -// -// } -// -// def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" -// if(CommonDatautils.isWindow()){ -// fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" -// } -// -// FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); -// println "txt 生成 " + rows.size() -// -// saveToPgSql(rows) + + def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" + if(CommonDatautils.isWindow()){ + fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" + } + + FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); + println "txt 生成 " + rows.size() + + saveToPgSql(rows) } def createData(def rets, cityCodeDatas, distCodeMap, source){ 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 91fb02cdc..591eb95bd 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-04-26", "2023-05-27") + def prices = CcbCommonUtils.findPersonPrice(city, "2023-05-27", "2023-06-21") // 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 db8fef0a1..2ce980c49 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 @@ -33,8 +33,8 @@ import java.util.regex.*; def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") -def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", - "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") +//def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", +// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -1287,18 +1287,18 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ -//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\人工指导价录入_1020.xlsx" -// -//ExcelUtils.multiThreadingModify(fileName, {d-> -// if(d['A']){ -//// def region = RegionData.formatRegion(d['A'], d['B']) -//// if(region){ -//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") -//// if(dist){ -//// d['E'] = dist.region -//// d['F'] = dist._id.toString() -//// } -//// } +def fileName = "D:\\数据\\建行\\房产估值\\指导价\\录入国信达价格_0602.xlsx" + +ExcelUtils.multiThreadingModify(fileName, {d-> + if(d['A']){ + def region = RegionData.formatRegion(d['B'], d['C']) + if(region){ + def dist = CommonDatautils.findDistrict(d['B'], region, d['E'], "district") + if(dist){ + d['G'] = dist.region + d['H'] = dist._id.toString() + } + } // if(!d['F']){ // def dist = CommonDatautils.findDistrictById(d['A']) //// @@ -1308,30 +1308,30 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ // d['F'] = dist.status // } // } -// -// } -//},0) - - -def fileName = "C:\\Users\\gaojuan\\Desktop\\房价网新增小区数据_0427.xlsx" -ExcelUtils.multiThreadingModify(fileName, { d -> - def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") - if(count && count==1){ - def dist = CommonDatautils.findDistrict(null, d['B'], d['C'], "district") - d['E'] = dist.city } - -// def dist = CommonDatautils.findDistrictById(d['A']) -// if(dist){ -// d['B'] = dist.region -// d['C'] = dist.name -// d['J'] = dist.status -// } -// def newRegion = RegionData.formatRegion(d['A'], d['B']) -// d['F'] = newRegion },0) + + +//def fileName = "C:\\Users\\gaojuan\\Desktop\\房价网新增小区数据_0427.xlsx" +//ExcelUtils.multiThreadingModify(fileName, { d -> +// def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") +// if(count && count==1){ +// def dist = CommonDatautils.findDistrict(null, d['B'], d['C'], "district") +// d['E'] = dist.city +// } +// +//// def dist = CommonDatautils.findDistrictById(d['A']) +//// if(dist){ +//// d['B'] = dist.region +//// d['C'] = dist.name +//// d['J'] = dist.status +//// } +//// def newRegion = RegionData.formatRegion(d['A'], d['B']) +//// d['F'] = newRegion +//},0) + //ExcelUtils.modify(fileName, {d-> // if(d['A']){ // def sql = "update guided_price_gj set dealdate=to_date('2022-09-20','yyyy-MM-dd') where id='${d['A']}'" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy index dd63a1c00..b604c38ff 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy @@ -31,14 +31,14 @@ class MasterNameInAlias { distance = com.fangjia.core.util.GeoUtils.calculateDistance(dist1.lng/10000000000d, dist1.lat/10000000000d, dist2.lng/10000000000d, dist2.lat/10000000000d); } distList << [dist2.city, dist2.region, dist2.name, dist2.estate_type2, dist2.address, dist2.alias?dist2.alias.join(' '):'', distance] -// def newAlias = dist2.alias.remove(dist1.name) -// def d = new BasicDBObject() -// d.put("_id", dist2._id) -// -// def udata = new BasicDBObject() -// udata.put("alias", newAlias) -// udata.put("m_date", new Date()) -// DbUtils.seaweed.update(d, new BasicDBObject('$set', udata)) + dist2.alias.remove(dist1.name) + def d = new BasicDBObject() + d.put("_id", dist2._id) + + def udata = new BasicDBObject() + udata.put("alias", dist2.alias) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(d, new BasicDBObject('$set', udata)) } } } @@ -54,6 +54,6 @@ class MasterNameInAlias { println city +" "+cityList.size() } } - ExcelUtils.write("d:\\数据\\小区\\主名在别名中.xlsx", allList, "数据") +// ExcelUtils.write("d:\\数据\\小区\\主名在别名中.xlsx", allList, "数据") } }