From 68a9c8379b562b74684e266c8cb1d025bdb1d7ba Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 9 Jan 2023 18:53:07 +0800 Subject: [PATCH] update --- .../ronghe/ExportDistrictRongHe.groovy | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) 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 3c889c1b6..48e927791 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 @@ -34,34 +34,35 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] //按天导(每天一个文件夹) - exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) +// exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) if(curDate.toString().endsWith("10")){ - exportBigdataCommunityGJRH()// - exportBigdataBuildingFJW()// - exportBigdataCommfeeGj()// +// exportBigdataCommunityGJRH()// +// exportBigdataBuildingFJW()// +// exportBigdataCommfeeGj()// +// +// exportBigdataCommbuildstruGJ()// +// exportBigdataCommhousetypeGJ()// +// exportBigdataCommbuildyearGj()// +// exportBigdataCommhouseuseGJ()// +// exportBigdataPositionGJ()// +// exportBigdataDistrictFJW()// +// exportBigdataAliasFJW()// +// +// exportBigdataBuildprojFjw() +// exportBigdataCommlayoutpicFjw() +// exportEvaluateRate() - exportBigdataCommbuildstruGJ()// - exportBigdataCommhousetypeGJ()// - exportBigdataCommbuildyearGj()// - exportBigdataCommhouseuseGJ()// - exportBigdataPositionGJ()// - exportBigdataDistrictFJW()// - exportBigdataAliasFJW()// - - exportBigdataBuildprojFjw() - exportBigdataCommlayoutpicFjw() - exportEvaluateRate() - - //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输 +// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输 exportThirdPartyPrice2(lastMonth, new_dists) - - - //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 +// +// +// //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 exportCommunityBasePrice(lastMonth) exportCommunityPdescribeGj(lastMonth) exportGuideStatistics(lastMonth) exportBigdataSupplierStatistics(lastMonth) + exportBigdataModelingBase(lastMonth) } SSHHelper jschCommand = new SSHHelper(); @@ -939,7 +940,7 @@ class ExportDistrictRongHe extends BaseBatch{ def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" } @@ -1013,7 +1014,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "community_p_describe_gj 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "community_p_describe_gj 上传Ftp完成......" } @@ -1053,7 +1054,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "guide_statistics 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "guide_statistics 上传Ftp完成......" } @@ -1092,7 +1093,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "bigdata_supplier_statistics 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "bigdata_supplier_statistics 上传Ftp完成......" } @@ -1135,7 +1136,7 @@ class ExportDistrictRongHe extends BaseBatch{ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "bigdata_modeling_base 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpUtils.ftpUpload("rh", fileName, curDate) println "bigdata_modeling_base 上传Ftp完成......" }