From 58e277a6a3c3984d7443e1d9f35ea05e1f918cbd Mon Sep 17 00:00:00 2001 From: goojiayangqi <1052755581@163.com> Date: Fri, 8 Mar 2024 15:15:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=A4=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ronghe/ExportDistrictRongHe.groovy | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) 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 3a55f12b6..75d052af1 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 @@ -69,6 +69,13 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataCityPrice(queryDate) exportBigdataDistPrice(queryDate) exportBigdataCommPrice(queryDate) + exportBigdataCommPrice(queryDate) + // 新增两张数据表 + // avm_evaluate_rate_city_gj_h + // avm_evaluate_rate_comm_gj_h + exportEvaluateRateCity(queryDate) + exportEvaluateRateComm(queryDate) + //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 // exportCommunityBasePrice(lastMonth) // exportCommunityPdescribeGj(lastMonth) @@ -228,6 +235,79 @@ class ExportDistrictRongHe extends BaseBatch{ CcbFtpUtils.ftpUpload("rh",fileName, curDate) println "GUIDED_PRICE_GJ 上传Ftp完成......" } + // avm_evaluate_rate_city_gj_h gujia_clc_yrmo_val =202402 and gujia_clc_yrmo_val<=202403 gujia_clc_yrmo_val>=to_date('${startDateStr}','yyyy-MM-dd') and gujia_clc_yrmo_val<=to_date('${endDateStr}','yyyy-MM-dd') + def exportEvaluateRateComm(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_bld_tp_val,gujia_bld_tp_val_coef,gujia_clc_yrmo_val,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_city_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = ${queryDate}"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_bld_tp_val + data << r.gujia_bld_tp_val_coef + data << r.gujia_clc_yrmo_val + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + // FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_ + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_${curDate}_0001.dat" + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + + println "EVALUATE_RATE_CITY_FLW_ADD 数据文件输出完成......" + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "EVALUATE_RATE_CITY_FLW_ADD 上传Ftp完成......" + } + + def exportEvaluateRateCity(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_clc_yrmo_val,basic_price,area_avg,unitprc_avg,unitprc_avg,comm_type,area_avg_coef,unitprc_avg_coef,basic_price_coef,buildarea_coef,type_coef,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_city_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = ${queryDate} "; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujia_clc_yrmo_val + data << r.basic_price + data << r.area_avg + data << r.unitprc_avg + data << r.comm_type + data << r.area_avg_coef + data << r.basic_price_coef + data << r.buildarea_coef + data << r.type_coef + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + // FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ avm_evaluate_rate_comm_gj_h + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_PRICE_GJ_ALL_${curDate}_0001.dat" + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + + println "FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ 数据文件输出完成......" + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ 上传Ftp完成......" + } def exportBigdataCommbuildstruGJ(){ From bb42620c92ded15281a1f9fa5a6dab7c7533ead5 Mon Sep 17 00:00:00 2001 From: goojiayangqi <1052755581@163.com> Date: Fri, 8 Mar 2024 17:46:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=A4=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ronghe/ExportDistrictRongHe.groovy | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 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 75d052af1..4d3833534 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 @@ -236,11 +236,11 @@ class ExportDistrictRongHe extends BaseBatch{ println "GUIDED_PRICE_GJ 上传Ftp完成......" } // avm_evaluate_rate_city_gj_h gujia_clc_yrmo_val =202402 and gujia_clc_yrmo_val<=202403 gujia_clc_yrmo_val>=to_date('${startDateStr}','yyyy-MM-dd') and gujia_clc_yrmo_val<=to_date('${endDateStr}','yyyy-MM-dd') - def exportEvaluateRateComm(){ + def exportEvaluateRateCity(queryDate){ def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select urbn_id,gujia_bld_tp_val,gujia_bld_tp_val_coef,gujia_clc_yrmo_val,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_city_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = ${queryDate}"; + def sql = "select urbn_id,gujia_bld_tp_val,gujia_bld_tp_val_coef,gujia_clc_yrmo_val,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_city_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = '${queryDate}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.urbn_id @@ -256,23 +256,23 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" // FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_ - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_CITY_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_CITY_FLW_ADD_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_CITY_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "EVALUATE_RATE_CITY_FLW_ADD 数据文件输出完成......" + println "EVALUATE_RATE_CITY_FJW_ADD 数据文件输出完成......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "EVALUATE_RATE_CITY_FLW_ADD 上传Ftp完成......" + println "EVALUATE_RATE_CITY_FJW_ADD 上传Ftp完成......" } - def exportEvaluateRateCity(){ + def exportEvaluateRateComm(queryDate){ def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_clc_yrmo_val,basic_price,area_avg,unitprc_avg,unitprc_avg,comm_type,area_avg_coef,unitprc_avg_coef,basic_price_coef,buildarea_coef,type_coef,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_city_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = ${queryDate} "; + def sql = "select urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_clc_yrmo_val,basic_price,area_avg,unitprc_avg,unitprc_avg,comm_type,area_avg_coef,unitprc_avg_coef,basic_price_coef,buildarea_coef,type_coef,data_crt_tm,data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_evaluate_rate_comm_gj_h where urbn_id='${cityCode}' and gujia_clc_yrmo_val = '${queryDate}' "; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.urbn_id @@ -297,16 +297,16 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" // FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ avm_evaluate_rate_comm_gj_h - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_COMM_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_COMM_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - println "FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ 数据文件输出完成......" + println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_ADD_ 数据文件输出完成......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "FJW_000000_000000_EVALUATE_RATE_COMM_FLW_ADD_ 上传Ftp完成......" + println "FJW_000000_000000_EVALUATE_RATE_COMM_FJW_ADD_ 上传Ftp完成......" } From 6e48ce05ee1f6343488c1499c0ea1774726d30bc Mon Sep 17 00:00:00 2001 From: goojiayangqi <1052755581@163.com> Date: Fri, 8 Mar 2024 17:56:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=A4=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy | 1 - 1 file changed, 1 deletion(-) 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 4d3833534..50cc6343f 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 @@ -69,7 +69,6 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataCityPrice(queryDate) exportBigdataDistPrice(queryDate) exportBigdataCommPrice(queryDate) - exportBigdataCommPrice(queryDate) // 新增两张数据表 // avm_evaluate_rate_city_gj_h // avm_evaluate_rate_comm_gj_h