update
This commit is contained in:
+42
-42
@@ -67,50 +67,50 @@ class BigdataDealBatch extends BaseBatch{
|
|||||||
}
|
}
|
||||||
|
|
||||||
println "curDate:"+curDate
|
println "curDate:"+curDate
|
||||||
for(def city : citys){
|
|
||||||
// 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){
|
// for(def city : citys){
|
||||||
// index ++
|
//// if(!ccbCitys.contains(city)){
|
||||||
// def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
// addDealPriceMatch(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 fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat"
|
def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"]
|
||||||
// if(CommonDatautils.isWindow()){
|
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||||
// fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat"
|
def index = 0
|
||||||
// }
|
for(def city : citys){
|
||||||
//
|
index ++
|
||||||
// FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false);
|
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||||
// println "txt 生成 " + rows.size()
|
def ppeDists = [:]
|
||||||
//
|
|
||||||
// saveToPgSql(rows)
|
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 createData(def rets, cityCodeDatas, distCodeMap, source){
|
def createData(def rets, cityCodeDatas, distCodeMap, source){
|
||||||
|
|||||||
+2
-2
@@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
|||||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||||
|
|
||||||
//添加自己库中的人工指导价
|
//添加自己库中的人工指导价
|
||||||
def prices = CcbCommonUtils.findPersonPrice(city, "2023-02-27", "2023-03-21")
|
def prices = CcbCommonUtils.findPersonPrice(city, "2023-03-21", "2023-04-21")
|
||||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||||
if(prices){
|
if(prices){
|
||||||
def distMap = getDistrictMap(city)
|
def distMap = getDistrictMap(city)
|
||||||
@@ -85,7 +85,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
|||||||
saveToPgSql(rows)
|
saveToPgSql(rows)
|
||||||
|
|
||||||
//更新静态数据表
|
//更新静态数据表
|
||||||
// updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+13
-10
@@ -66,10 +66,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
|||||||
exportBigdataDistPrice(queryDate)
|
exportBigdataDistPrice(queryDate)
|
||||||
exportBigdataCommPrice(queryDate)
|
exportBigdataCommPrice(queryDate)
|
||||||
|
|
||||||
//因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供
|
|
||||||
def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
|
|
||||||
// exportThirdPartyPrice2(thirdPartyMonth, new_dists)
|
|
||||||
exportPgThirdPartyPrice2(thirdPartyMonth, new_dists)
|
|
||||||
|
|
||||||
//1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据
|
//1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据
|
||||||
// exportCommunityBasePrice(lastMonth)
|
// exportCommunityBasePrice(lastMonth)
|
||||||
@@ -78,16 +75,22 @@ class ExportDistrictRongHe extends BaseBatch{
|
|||||||
// exportBigdataSupplierStatistics(lastMonth)
|
// exportBigdataSupplierStatistics(lastMonth)
|
||||||
// exportBigdataModelingBase(lastMonth)
|
// exportBigdataModelingBase(lastMonth)
|
||||||
|
|
||||||
exportPgCommunityBasePrice(lastMonth)
|
|
||||||
exportPgCommunityPdescribeGj(lastMonth)
|
|
||||||
exportPgGuideStatistics(lastMonth)
|
|
||||||
exportPgBigdataSupplierStatistics(lastMonth)
|
|
||||||
exportPgBigdataModelingBase(lastMonth)
|
|
||||||
|
|
||||||
//2月8号 临时导出苏州一年的数据
|
//2月8号 临时导出苏州一年的数据
|
||||||
exportPgBigdataForsale("2023-03-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出
|
exportPgBigdataForsale("2023-03-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(curDate.toString().endsWith("28")){
|
||||||
|
exportPgBigdataSupplierStatistics(lastMonth)
|
||||||
|
//因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供
|
||||||
|
def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
|
||||||
|
// exportThirdPartyPrice2(thirdPartyMonth, new_dists)
|
||||||
|
exportPgThirdPartyPrice2(thirdPartyMonth, new_dists)
|
||||||
|
exportPgCommunityBasePrice(lastMonth)
|
||||||
|
exportPgCommunityPdescribeGj(lastMonth)
|
||||||
|
exportPgBigdataModelingBase(lastMonth)
|
||||||
|
exportPgGuideStatistics(lastMonth)
|
||||||
|
}
|
||||||
|
|
||||||
SSHHelper jschCommand = new SSHHelper();
|
SSHHelper jschCommand = new SSHHelper();
|
||||||
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
|
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user