diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy index 62ace6306..3fffa870c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy @@ -19,10 +19,10 @@ class CcbFtpUtils { static ChannelSftp sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); - static def ftpUpload(outputPath_dist, month){ + static def ftpUpload(type,outputPath_dist, month){ //上传到ftp sftpChannel = reConnect(); - if(month.toString().contains("10/") || month.toString().endsWith("10")){ + if(type && type=="rh"){ sftp.upload(ftpPath_rh+ month+"/", outputPath_dist, sftpChannel); }else{ sftp.upload(ftpPath+ month+"/", outputPath_dist, sftpChannel); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy index cb4fdc1e5..1bd63cbeb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy @@ -1,6 +1,7 @@ package com.fangjia.script.ccbevaluation import com.fangjia.core.RegionData +import com.fangjia.script.ccbevaluation.ronghe.SSHHelper import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.ccbevaluation.CcbFtpUtils import com.fangjia.script.gj.ccb.FileUtils @@ -37,9 +38,9 @@ class ExportOracleData { // exportCommunityStaging() // exportCommunityBuileType() - exportThirdPartyPrice2(lastMonth) +// exportThirdPartyPrice2(lastMonth) // exportBigdataForsale("2021-12-19") - exportBigdataDeal("2021-12-01") +// exportBigdataDeal("2021-12-01") //计算结果相关 @@ -54,9 +55,12 @@ class ExportOracleData { // // exportCommunityPdescribeGj(curMonth) // exportCommCaseDetailGj(curMonth) -// -// //ok文件 -// exportLastFile() + + def curDate = curMonth.toString()+"28" + SSHHelper jschCommand = new SSHHelper(); + System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}")); + //ok文件 + exportLastFile() } @@ -85,7 +89,7 @@ class ExportOracleData { def headers = []//["系数ID","系数类型","系数","排序","城市","备注","创建时间","更新时间","来源公司"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "上传Ftp完成......" } @@ -120,7 +124,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_POI_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_POI_GJ 上传Ftp完成......" } @@ -147,7 +151,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "COMMUNITY_STAGING_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "COMMUNITY_STAGING_GJ 上传Ftp完成......" } @@ -181,7 +185,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_COMMBUILDTYPE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_COMMBUILDTYPE_GJ 上传Ftp完成......" } @@ -218,7 +222,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_DISTRICT_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_DISTRICT_GJ 上传Ftp完成......" } @@ -253,7 +257,7 @@ class ExportOracleData { //["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "GUIDED_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "GUIDED_PRICE_GJ 上传Ftp完成......" } @@ -286,7 +290,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "COMMUNITY_GUIDE_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "COMMUNITY_GUIDE_PRICE_GJ 上传Ftp完成......" } @@ -376,7 +380,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_DEAL_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_DEAL_GJ 上传Ftp完成......" } @@ -425,7 +429,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "THIRD_PARTY_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "THIRD_PARTY_PRICE_GJ 上传数据文件完成......" } @@ -460,7 +464,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) } @@ -514,7 +518,7 @@ class ExportOracleData { //"乡镇/街道办","逻辑行政区划代码","逻辑行政区划","状态"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_COMMUNITY_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_COMMUNITY_GJ 上传Ftp完成......" } @@ -606,7 +610,7 @@ class ExportOracleData { } println "BIGDATA_FORSALE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_FORSALE_GJ 上传Ftp完成......" } @@ -669,8 +673,8 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); println "AVM_EVALUATION_GJNB 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) - CcbFtpUtils.ftpUpload(fileName1, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName1, curDate) println "AVM_EVALUATION_GJNB 上传Ftp完成......" } @@ -719,8 +723,8 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); println "AVM_EVALUATION_ITEM_GJNB 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) - CcbFtpUtils.ftpUpload(fileName1, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName1, curDate) println "AVM_EVALUATION_ITEM_GJNB 上传Ftp完成......" } @@ -762,8 +766,8 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) - CcbFtpUtils.ftpUpload(fileName1, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName1, curDate) println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" } @@ -802,7 +806,7 @@ class ExportOracleData { def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" } @@ -831,7 +835,7 @@ class ExportOracleData { def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "CITY_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "CITY_PRICE_GJ 上传Ftp完成......" } @@ -862,7 +866,7 @@ class ExportOracleData { def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "DISTRICT_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "DISTRICT_PRICE_GJ 上传Ftp完成......" } @@ -930,7 +934,7 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); // } println "community_p_describe_gj 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "community_p_describe_gj 上传Ftp完成......" } @@ -967,12 +971,10 @@ class ExportOracleData { if(allRows.size()>0){ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); } - - println city } println "comm_case_detail_gj 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload(null, fileName, curDate) println "comm_case_detail_gj 上传Ftp完成......" } @@ -983,7 +985,7 @@ class ExportOracleData { dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(dataCodeFileName, curDate) + CcbFtpUtils.ftpUpload(null, dataCodeFileName, curDate) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy index c52ecb26b..167fda35a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/MatchDealPriceRegion.groovy @@ -31,13 +31,16 @@ class MatchDealPriceRegion { if(!newRegion){ index++ newRegion = findRegionByThirdPrice(d['B'], d['D']); - if(!newRegion || (newRegion && newRegion==d['C'])){ + if(!newRegion){ def rets = CommonDatautils.findDistrictsByName(d['B'], d['D'],"district") + if(!rets){ + rets = CommonDatautils.findDistrictByAlias(d['B'], null,d['D'],"district") + } if(rets && rets.size()==1){ newRegion = rets[0].region } } - if(newRegion && newRegion!=d['C']){ + if(newRegion){ def query = new BasicDBObject() query.put("_id", new ObjectId(d['A'])) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index a027b584e..fff8d13cf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -24,43 +24,77 @@ class ExportDistrictRongHe extends BaseBatch{ @Override void process(Object args) { - def citys = CcbCommonUtils.citys; - def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") + //按天导(每天一个文件夹) + exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd")) + if(curDate.toString().endsWith("10")){ + exportBigdataCommunityGJRH() + exportBigdataBuildingFJW() + exportBigdataCommfeeGj() -// //检查ok文件是否上传 -// exportAllBigdataDealFJW() - for(def city : citys) { - def cityCode = cityCodeDataMap.get(city) -// -// exportBigdataDealFJW(cityCode, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// - exportBigdataCommunityGJRH(cityCode) - exportBigdataBuildingFJW(cityCode) - exportBigdataCommfeeGj(cityCode) -// - exportBigdataCommbuildstruGJ(cityCode) - exportBigdataCommhousetypeGJ(cityCode) - exportBigdataCommbuildyearGj(cityCode) - exportBigdataCommhouseuseGJ(cityCode) - exportBigdataPositionGJ(cityCode) - exportBigdataDistrictFJW(cityCode) - exportBigdataAliasFJW(cityCode) + exportBigdataCommbuildstruGJ() + exportBigdataCommhousetypeGJ() + exportBigdataCommbuildyearGj() + exportBigdataCommhouseuseGJ() + exportBigdataPositionGJ() + exportBigdataDistrictFJW() + exportBigdataAliasFJW() - exportBigdataBuildprojFjw(cityCode) - exportBigdataCommlayoutpicFjw(cityCode) + exportBigdataBuildprojFjw() + exportBigdataCommlayoutpicFjw() + exportEvaluateRate() } - exportEvaluateRate() - exportOk() -// -// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" -// SSHHelper jschCommand = new SSHHelper(); -// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/package.sh ${curDate}")); + SSHHelper jschCommand = new SSHHelper(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); + + exportOk(curDate) } +// +// def runByCity(){ +// def citys = CcbCommonUtils.citys; +// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +// +// +//// //检查ok文件是否上传 +//// exportAllBigdataDealFJW() +//// for(def city : citys) { +//// def cityCode = cityCodeDataMap.get(city) +//// +// //按天导(一个文件夹下) +// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) +// //按天导(每天一个文件夹) +// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) +// +//// exportBigdataCommunityGJRH(cityCode) +//// exportBigdataBuildingFJW(cityCode) +//// exportBigdataCommfeeGj(cityCode) +//// +//// exportBigdataCommbuildstruGJ(cityCode) +//// exportBigdataCommhousetypeGJ(cityCode) +//// exportBigdataCommbuildyearGj(cityCode) +//// exportBigdataCommhouseuseGJ(cityCode) +//// exportBigdataPositionGJ(cityCode) +//// exportBigdataDistrictFJW(cityCode) +//// exportBigdataAliasFJW(cityCode) +//// +//// exportBigdataBuildprojFjw(cityCode) +//// exportBigdataCommlayoutpicFjw(cityCode) +//// } +//// exportEvaluateRate() +// +//// +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") +// SSHHelper jschCommand = new SSHHelper(); +// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); +// +// exportOk() +// } + def exportBigdataCommunityGJRH(cityCode){ - def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW where CITYID='${cityCode}'"; + def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -86,21 +120,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - - - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......" - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......" } - def exportBigdataCommbuildstruGJ(cityCode){ - def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW where CITYID='${cityCode}'"; + def exportBigdataCommbuildstruGJ(){ + def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -114,17 +145,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......" } def exportBigdataCommhousetypeGJ(cityCode){ - def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW where CITYID='${cityCode}'"; + def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -138,17 +169,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......" } - def exportBigdataCommbuildyearGj(cityCode){ - def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW where CITYID='${cityCode}'"; + def exportBigdataCommbuildyearGj(){ + def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -162,17 +193,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......" } - def exportBigdataCommfeeGj(cityCode){ - def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW where CITYID='${cityCode}'"; + def exportBigdataCommfeeGj(){ + def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW";//where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -196,18 +227,18 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMFEE_FJW 上传Ftp完成......" } - def exportBigdataCommhouseuseGJ(cityCode){ - def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW where CITYID='${cityCode}'"; + def exportBigdataCommhouseuseGJ(){ + def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -222,17 +253,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......" } - def exportBigdataPositionGJ(cityCode){ - def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW where CITYID='${cityCode}'"; + def exportBigdataPositionGJ(){ + def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -251,17 +282,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_POSITION_FJW 上传Ftp完成......" } - def exportBigdataDistrictFJW(cityCode){ - def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW where CITYID='${cityCode}'"; + def exportBigdataDistrictFJW(){ + def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -279,17 +310,17 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "BIGDATA_DISTRICT_FJW 上传Ftp完成......" } - def exportBigdataAliasFJW(cityCode){ - def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW where city_id='${cityCode}'"; + def exportBigdataAliasFJW(){ + def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}' def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] @@ -310,16 +341,16 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "ADDRESS_ALIAS_FJW 上传Ftp完成......" } - def exportBigdataDealFJW(cityCode, dealdate){ + def exportBigdataDealFJW(dealdate){ def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") @@ -334,14 +365,14 @@ class ExportDistrictRongHe extends BaseBatch{ index++ def curStartStr = curStartDateStr - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] if(index==1){ - def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')"; + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and sqlInstance.eachRow(sql,{r-> def data = [] data << r.CITYID @@ -420,13 +451,107 @@ class ExportDistrictRongHe extends BaseBatch{ stop = true } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr } } + + def exportBigdataDealFJW2(curDate, dealdate){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + + def allRows = [] + if(curDate.toString().endsWith("01")){ + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.DEALID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.STREET + data << r.STREETNO + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.PERIODNUM + data << r.FLOORNUM + data << r.FLOORTYPE + data << r.FLOORCNT + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEUSE + data << r.HOUSESTRU + data << r.HOUSEASPECT + data << r.FITMENT + data << r.EVALUATENO + data << r.DEALUNITPRICE + data << r.DEALTOTALPRICE + data << r.DECLAREPRICE + data << r.EVALUATEPRICE + data << r.CONTRACTNO + data << r.DEALDATE + data << r.DEALTYPE + data << r.PAYTYPE + data << r.DEALPERIOD + data << r.IFELEVATOR + data << r.COMPAREAGARDEN + data << r.COMPAREATERRACE + data << r.COMPAREABALCONY + data << r.COMPAREABAYWINDOW + data << r.COMPAREAATTIC + data << r.COMPAREAGARAGE + data << r.COMPAREABASEMENT + data << r.COMPAREAOTHER + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.REMARK + data << r.CREATETIME1 + data << r.UPDATETIME1 + data << r.SOURCECODE + data << r.WORKDATE + allRows << data + }); + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}" + } + def exportAllBigdataDealFJW(){ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where DEALDATE def data = [] @@ -547,12 +672,12 @@ class ExportDistrictRongHe extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_BUILDING_FJW 上传Ftp完成......" } @@ -580,40 +705,40 @@ class ExportDistrictRongHe extends BaseBatch{ fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate) + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "EVALUATE_RATE_FJW 上传Ftp完成......" } - def exportBigdataBuildprojFjw(cityCode){ + def exportBigdataBuildprojFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......" } - def exportBigdataCommlayoutpicFjw(cityCode){ + def exportBigdataCommlayoutpicFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......" } - def exportOk(){ - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def exportOk(curDate){ +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok" if(CommonDatautils.isWindow()){ dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); - CcbFtpUtils.ftpUpload(dataCodeFileName, curDate) + CcbFtpUtils.ftpUpload("rh",dataCodeFileName, curDate) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index 63732e34f..9502023d9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -1356,6 +1356,18 @@ class CommonDatautils { } return regions; } + + public static def getOrgName(def city, def name){ + DBObject queryCondition = new BasicDBObject() + queryCondition.put("city", city); + queryCondition.put("name", name); + def dbCursor = REGION_BLOCK_COLL.find(queryCondition) + def orgName = null + for(DBObject obj : dbCursor){ + orgName = obj.org_name + } + return orgName; + } public static def getAllCityRegions(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy index 46ad15c1b..072e16e0a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy @@ -19,8 +19,8 @@ class FzDataResultStat { static main(args) { def task = new FzDataResultStat() - //task.priceMarkupRun(); - task.regionPriceTrendRun() + task.priceMarkupRun(); +// task.regionPriceTrendRun() } def priceMarkupRun(){ def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); @@ -42,20 +42,44 @@ class FzDataResultStat { map2.put(key, row[5]) } def rows = [] + rows << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅"] map1.each {k,v-> def row = [] def keys = k.split("##") def lastPrice = map2.get(k) def markup = null if(v && lastPrice){ - markup = (v - lastPrice)*100.0/lastPrice + markup = (v.toInteger() - lastPrice.toInteger())*100.0/lastPrice.toInteger() } rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString(), markup] } - ExcelUtils.write("D:\\数据\\福州\\价格比对_${curMonth}.xlsx", rows, "数据") + //ExcelUtils.write("D:\\数据\\福州\\价格比对_${curMonth}.xlsx", rows, "数据") def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"]; + def datas1 = [] + def datas2 = [] + datas1 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅"] + datas2 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅"] + def row_num = 0 + for(def row : rows){ + if(row_num>0){ + def region = row[1] + if(regions.contains(region)){ + if(row[5] && Math.abs(row[5])>10){ + datas1 << row + } + }else{ + if(row[5] && Math.abs(row[5])>10){ + datas2 << row + } + } + } + row_num++ + } + + ExcelUtils.write("D:\\数据\\福州\\6区(超10%)_${curMonth}.xlsx", datas1, "数据") + ExcelUtils.write("D:\\数据\\福州\\7县(超10%)_${curMonth}.xlsx", datas2, "数据") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/TempMatchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/TempMatchDistrict.groovy new file mode 100644 index 000000000..9b1c8cfc3 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/TempMatchDistrict.groovy @@ -0,0 +1,70 @@ +package com.fangjia.script.gj.data + +import com.fangjia.core.RegionData +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.district.SeaweedDataMatchProcess +import com.fangjia.script.util.ExcelUtils +import org.apache.xmlbeans.impl.regex.Match + +import java.util.regex.Pattern + +class TempMatchDistrict { + static main(args) { + def task = new TempMatchDistrict() +// task.run() + task.regionConver() + } + + def regionConver(){ + //,"北京" + def files = ["广州","杭州","合肥","上海","深圳","石家庄","苏州","天津","武汉","西安","重庆"] + for(def f : files){ + ExcelUtils.multiThreadingModify("D:\\数据\\其它\\均价数据\\"+f+".xlsx",{d-> + def orgName = CommonDatautils.getOrgName(f, d['M']) + if(orgName){ + d['M'] = orgName + } + }) + } + } + def run(){ + def path = "D:\\数据\\小区\\收集数据-匹配\\收集数据" + def files = ["合肥.xlsx","湖北.xlsx","陕西.xlsx","上海.xlsx","深圳.xlsx","苏州.xlsx","天津.xlsx","雄安.xlsx","浙江.xlsx","重庆.xlsx"] + for(def f : files){ + def filePath = path+"\\"+f; + match(filePath); + } + } + def match(filePath){ + ExcelUtils.multiThreadingModify(filePath,{d-> + def city = d['B'].replace("市","") +// def newRegion = RegionData.formatRegion(city, d['C']) +// if(newRegion){ + def rMap = SeaweedDataMatchProcess.doMatch(city, d['C'], d['D'], null); + if(rMap){ + def dist = CommonDatautils.queryDistrictById(rMap.id) + if(dist){ + d['N'] = dist._id.toString() + d['O'] = CommonDatautils.getOrgName(city, dist.region) + d['P'] = dist.name + d['Q'] = dist.lng2/10000000000.0 + d['R'] = dist.lat2/10000000000.0 + d['S'] = getYear(dist.finish_building_date) + } + } +// } + }) + } + + + def getYear(finishBuildingDate){ + if(finishBuildingDate){ + Pattern pat3 = Pattern.compile("\\d{4}"); + def matcher3 = pat3.matcher(finishBuildingDate); + if(matcher3.find()){ + return matcher3.group() + } + } + return null + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy index fab36e220..67160f9e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy @@ -164,12 +164,12 @@ class DistrictIndexBatch extends BaseBatch{ def getHousePrice(d, dists, priceMap, citycode){ //def areas = findHouse(d, 20200101, 20220101) - def areas = [] - if(citycode){ - areas = findHouseByOracle(d._id.toString(), citycode); - }else{ - areas = findHouse(d, 20200101, 20220101) - } + def areas = [] +// if(citycode){ +// areas = findHouseByOracle(d._id.toString(), citycode); +// }else{ + areas = findHouse(d, 20200101, DateUtils.formatDateByPattern(new Date(),"yyyyMMdd")) +// } def avg_area = null if(areas){ avg_area = areas.sum()/areas.size();