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 efcbda2f1..2f34573dd 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 @@ -38,7 +38,7 @@ 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")){ @@ -77,7 +77,7 @@ class ExportDistrictRongHe extends BaseBatch{ } //2月8号 临时导出苏州一年的数据 - exportBigdataForsale("2022-07-01", new_dists) //现在按updatetime导出 +// exportBigdataForsale("2022-07-01", new_dists) //现在按updatetime导出 SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); @@ -1197,7 +1197,7 @@ class ExportDistrictRongHe extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_CITYPRICE 上传Ftp完成......" } @@ -1244,7 +1244,7 @@ class ExportDistrictRongHe extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_DISTPRICE 上传Ftp完成......" } @@ -1291,7 +1291,7 @@ class ExportDistrictRongHe extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMPRICE 上传Ftp完成......" } @@ -1309,7 +1309,7 @@ class ExportDistrictRongHe extends BaseBatch{ } def exportBigdataForsale(publishDate, new_dists){ - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat"