From e9ac78eff35a890566aee5ba23bd47a340ccac89 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 27 Dec 2022 10:51:59 +0800 Subject: [PATCH] update --- .../ExportOracleAllDataTest.groovy | 70 +++++++++---------- .../ccbevaluation/ExportOracleDataTest.groovy | 64 ++++++++--------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy index 42f71fc0a..20fd78c85 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy @@ -42,45 +42,45 @@ class ExportOracleAllDataTest { def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def new_dists = [] -// exportBigdataForsale(new_dists) //2022-07-19 + exportBigdataForsale(new_dists) //2022-07-19 + + //不会变 10.25 + exportEvaluationRateData() + exportBigdataPoiData()// + exportBigdataDistrictData()// + + exportGuidedPrice()//随人工改变// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// + + //处理小区情况 + exportBigdataCommunity()// + exportCommunityStaging()//没cityid + exportCommunityBuileType()// + + exportThirdPartyPrice2(new_dists)// + exportBigdataDeal( new_dists) //2022-07-01 // -// //不会变 10.25 -// exportEvaluationRateData() -// exportBigdataPoiData()// -// exportBigdataDistrictData()// +// //第三方网站权重表 + exportWebsiteRate(); // -// exportGuidedPrice()//随人工改变// -// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// +// //计算结果相关 + exportAvmEvaluationGJNB()// + exportAVMEvaluationItemGJNB()// + + exportCityPrice()// + exportRegionPrice()// + + exportCommunityBasePriceGj()// + exportCommunityBasePrice()// + + exportCommunityPdescribeGj()// + exportCommCaseDetailGj()// // -// //处理小区情况 -// exportBigdataCommunity()// -// exportCommunityStaging()//没cityid -// exportCommunityBuileType()// -// -// exportThirdPartyPrice2(new_dists)// -// exportBigdataDeal( new_dists) //2022-07-01 -//// -//// //第三方网站权重表 -// exportWebsiteRate(); -//// -//// //计算结果相关 -// exportAvmEvaluationGJNB()// -// exportAVMEvaluationItemGJNB()// -// -// exportCityPrice()// -// exportRegionPrice()// -// -// exportCommunityBasePriceGj()// -// exportCommunityBasePrice()// -// -// exportCommunityPdescribeGj()// -// exportCommCaseDetailGj()// -// -// def curDate = curMonth.toString()+"28" + def curDate = curMonth.toString()+"28" // // ok文件 exportInOk() -// SSHHelperTest jschCommand = new SSHHelperTest(); -// System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); + SSHHelperTest jschCommand = new SSHHelperTest(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); } @@ -1207,7 +1207,7 @@ class ExportOracleAllDataTest { } def exportInOk(){ - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"15" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" Vector files = CcbFtpTestUtils.listFileNames(null, curDate) Iterator fileVec = files.iterator() def fileRows = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy index 412ec7c3a..f1f2e17bc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy @@ -32,37 +32,37 @@ class ExportOracleDataTest { def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def new_dists = [] //不会变 10.25 -// exportEvaluationRateData() -// exportBigdataPoiData()// -// exportBigdataDistrictData()// -// -// exportGuidedPrice()//随人工改变// -// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// -// -// //处理小区情况 -// exportBigdataCommunity()// -// exportCommunityStaging()//没cityid -// exportCommunityBuileType()// -// -// exportThirdPartyPrice2(lastMonth, new_dists)// -// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 -// exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 -// -// //第三方网站权重表 -// exportWebsiteRate(); -// -// //计算结果相关 -// exportAvmEvaluationGJNB(curMonth)//无城市区分 -// exportAVMEvaluationItemGJNB(curMonth)//无城市区分 -// -// exportCityPrice(curMonth)//无城市区分 -// exportRegionPrice(curMonth)//无城市区分 -// -// exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分 -// exportCommunityBasePrice(curMonth)//无城市区分 -// -// exportCommunityPdescribeGj(curMonth)//无城市区分 -// exportCommCaseDetailGj(curMonth)//无城市区分 + exportEvaluationRateData() + exportBigdataPoiData()// + exportBigdataDistrictData()// + + exportGuidedPrice()//随人工改变// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// + + //处理小区情况 + exportBigdataCommunity()// + exportCommunityStaging()//没cityid + exportCommunityBuileType()// + + exportThirdPartyPrice2(lastMonth, new_dists)// + exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 + exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 + + //第三方网站权重表 + exportWebsiteRate(); + + //计算结果相关 + exportAvmEvaluationGJNB(curMonth)//无城市区分 + exportAVMEvaluationItemGJNB(curMonth)//无城市区分 + + exportCityPrice(curMonth)//无城市区分 + exportRegionPrice(curMonth)//无城市区分 + + exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分 + exportCommunityBasePrice(curMonth)//无城市区分 + + exportCommunityPdescribeGj(curMonth)//无城市区分 + exportCommCaseDetailGj(curMonth)//无城市区分 def curDate = curMonth.toString()+"28" // ok文件 @@ -1156,7 +1156,7 @@ class ExportOracleDataTest { ChannelSftp.LsEntry file = fileVec.next() if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ - fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(file.getFilename(), curDate) + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(null, file.getFilename(), curDate) } } def fileName = "/ccb_evaluation/${curDate}.ok"