Merge branch 'script_gj' into 'master'

还原

See merge request !674
This commit is contained in:
2023-07-10 16:40:11 +08:00
@@ -45,27 +45,27 @@ class ExportDistrictRongHe extends BaseBatch{
//按天导(每天一个文件夹) //按天导(每天一个文件夹)
// 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)
// exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists)
// if(curDate.toString().endsWith("10")){ if(curDate.toString().endsWith("10")){
// exportBigdataCommunityGJRH()// exportBigdataCommunityGJRH()//
// exportBigdataBuildingFJW()// exportBigdataBuildingFJW()//
// exportBigdataCommfeeGj()// exportBigdataCommfeeGj()//
//
// exportBigdataCommbuildstruGJ()// exportBigdataCommbuildstruGJ()//
// exportBigdataCommhousetypeGJ()// exportBigdataCommhousetypeGJ()//
// exportBigdataCommbuildyearGj()// exportBigdataCommbuildyearGj()//
// exportBigdataCommhouseuseGJ()// exportBigdataCommhouseuseGJ()//
// exportBigdataPositionGJ()// exportBigdataPositionGJ()//
// exportBigdataDistrictFJW()// exportBigdataDistrictFJW()//
// exportBigdataAliasFJW()// exportBigdataAliasFJW()//
//
// exportBigdataBuildprojFjw() exportBigdataBuildprojFjw()
// exportBigdataCommlayoutpicFjw() exportBigdataCommlayoutpicFjw()
// exportEvaluateRate() exportEvaluateRate()
//
// exportBigdataCityPrice(queryDate) exportBigdataCityPrice(queryDate)
// exportBigdataDistPrice(queryDate) exportBigdataDistPrice(queryDate)
exportBigdataCommPrice(queryDate) exportBigdataCommPrice(queryDate)
//1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据
// exportCommunityBasePrice(lastMonth) // exportCommunityBasePrice(lastMonth)
@@ -75,25 +75,25 @@ class ExportDistrictRongHe extends BaseBatch{
// exportBigdataModelingBase(lastMonth) // exportBigdataModelingBase(lastMonth)
//2月8号 临时导出苏州一年的数据 //2月8号 临时导出苏州一年的数据
// exportPgBigdataForsale(houseStartDate,DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 exportPgBigdataForsale(houseStartDate,DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出
// } }
//
// if(curDate.toString().endsWith("28")){
// exportPgBigdataSupplierStatistics(curMonth)
// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供
// def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
//// exportThirdPartyPrice2(thirdPartyMonth, new_dists)
// exportPgThirdPartyPrice2(thirdPartyMonth, new_dists)
// exportPgCommunityBasePrice(curMonth)
// exportPgCommunityPdescribeGj(curMonth)
// exportPgBigdataModelingBase(curMonth)
// exportPgGuideStatistics(curMonth)
// }
// SSHHelper jschCommand = new SSHHelper(); if(curDate.toString().endsWith("28")){
// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); exportPgBigdataSupplierStatistics(curMonth)
// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供
// exportOk(curDate) def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
// exportThirdPartyPrice2(thirdPartyMonth, new_dists)
exportPgThirdPartyPrice2(thirdPartyMonth, new_dists)
exportPgCommunityBasePrice(curMonth)
exportPgCommunityPdescribeGj(curMonth)
exportPgBigdataModelingBase(curMonth)
exportPgGuideStatistics(curMonth)
}
SSHHelper jschCommand = new SSHHelper();
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
exportOk(curDate)
} }
// //