From ac0ffde9c348a6a11ab2b2ccfd37c082172e77a3 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 23 May 2023 11:01:43 +0800 Subject: [PATCH] update --- .../ccbevaluation/pgsql/ExportAllPgData.groovy | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy index 0a01037d3..c27bb890e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy @@ -43,7 +43,7 @@ class ExportAllPgData { // exportCommunityGuidedPrice()//随政策// // //处理小区情况 // exportCommunityStaging()//没cityid -// exportBigdataCommunity()// + exportBigdataCommunity()// // // exportCommunityBuildType()// // @@ -802,8 +802,8 @@ class ExportAllPgData { fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } - def allRows = [] for(def city : citys) { + def allRows = [] def cityCode = cityCodeMap.get(city) def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where urbn_id='${cityCode}'";// pgsqlInstance.eachRow(sql, { r -> @@ -829,17 +829,19 @@ class ExportAllPgData { data << r.gujia_src_co allRows << data if(allRows.size()%200000==0){ - createFileToFtp("COMMUNITY_BASE_PRICE_GJNB",allRows, fileName, curDate, true) - createFileToFtp("COMMUNITY_BASE_PRICE_GJ",allRows, fileName1, curDate, true) + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); allRows.clear() } }); - } - if(allRows.size()>0){ - createFileToFtp("COMMUNITY_BASE_PRICE_GJNB",allRows, fileName, curDate, true) - createFileToFtp("COMMUNITY_BASE_PRICE_GJ",allRows, fileName1, curDate, true) + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + } } + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) }