diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy index e1bb0d430..70a2a1041 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -27,29 +27,30 @@ class ExportPgsqlBaseEvaluation { def run(args) { citys = CcbCommonUtils.getRunningCitys(args) + citys = citys.reverse() def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def new_dists = [] - exportEvaluationRateData() - exportBigdataPoiData() - exportBigdataDistrictData() - - //第三方网站权重表 - exportWebsiteRate(); - - exportGuidedPrice()//随人工改变// - exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// - //处理小区情况 - exportCommunityStaging()//没cityid - exportBigdataCommunity()// - - exportCommunityBuildType()// - - exportThirdPartyPrice2(lastMonth, new_dists)// +// exportEvaluationRateData() +// exportBigdataPoiData() +// exportBigdataDistrictData() +// +// //第三方网站权重表 +// exportWebsiteRate(); +// +// exportGuidedPrice()//随人工改变// +// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// +// //处理小区情况 +// exportCommunityStaging()//没cityid +// exportBigdataCommunity()// +// +// exportCommunityBuildType()// +// +// exportThirdPartyPrice2(lastMonth, new_dists)// exportBigdataForsale(lastMonthStr +"-18", new_dists) //现在按updatetime导出 - exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 +// exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 } def exportEvaluationRateData() { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy index 24254df78..a5321a3e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy @@ -14,7 +14,7 @@ import org.apache.commons.codec.digest.DigestUtils class ExportPgsqlEvaluationResult { - def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/postgres", + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", "postgres", "postgres", "org.postgresql.Driver") def citys = null def cityCodeMap = CcbCommonUtils.findCityCodeValue() @@ -34,17 +34,17 @@ class ExportPgsqlEvaluationResult { def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); //计算结果相关 -// exportAvmEvaluationGJNB(curMonth) -// exportAVMEvaluationItemGJNB(curMonth) -// -// exportCityPrice(curMonth) -// exportRegionPrice(curMonth) -// -// exportCommunityBasePrice(curMonth) -// -// exportCommunityPdescribeGj(curMonth) -// exportCommCaseDetailGj(curMonth) -// + exportAvmEvaluationGJNB(curMonth) + exportAVMEvaluationItemGJNB(curMonth) + + exportCityPrice(curMonth) + exportRegionPrice(curMonth) + + exportCommunityBasePrice(curMonth) + + exportCommunityPdescribeGj(curMonth) + exportCommCaseDetailGj(curMonth) + exportInOk() SSHHelperTest jschCommand = new SSHHelperTest(); @@ -57,36 +57,36 @@ class ExportPgsqlEvaluationResult { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_yrmo,gujia_comm_num,gujia_val_comm_num,gujia_prc_cvr_rate,gujiamnldrcprccommnum,gujia_mnl_drc_prc_pct,gujia_samp_comm_num,gujiaext_samp_clc_pct,gujianervethruncomnum,gujianervethrunclcpct,gujia_tst_case_num,gujia_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiamdl_tst_case_num,gujiamdl_tst_comm_num,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiatrdpttstcase_num,gujiatrdpttstcomm_num,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,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_evaluation_gj_h where gujia_yrmo = ${yearMonth} and urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_bds_yrmo,gujia_bds_comm_num,gujiabdsvalmnycommnum,gujia_prc_cvr_rate,gujiabdsmnldpccommnum,gujia_mnl_drc_prc_pct,gujiabdssamp_comm_num,gujiaext_samp_clc_pct,gujiabdsnervetncomnum,gujianervethrunclcpct,gujiabds_tst_case_num,gujiabds_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiabdsmdltstcasenum,gujiabdsmdltstcommnum,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiabdstrdpttcasenum,gujiabdstrdpttcommnum,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,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_evaluation_gj_h where gujia_bds_yrmo = ${yearMonth} and urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_fsid data << r.urbn_id data << r.urbn_nm - data << r.gujia_yrmo - data << r.gujia_comm_num - data << r.gujia_val_comm_num + data << r.gujia_bds_yrmo + data << r.gujia_bds_comm_num + data << r.gujiabdsvalmnycommnum data << r.gujia_prc_cvr_rate - data << r.gujiamnldrcprccommnum + data << r.gujiabdsmnldpccommnum data << r.gujia_mnl_drc_prc_pct - data << r.gujia_samp_comm_num + data << r.gujiabdssamp_comm_num data << r.gujiaext_samp_clc_pct - data << r.gujianervethruncomnum + data << r.gujiabdsnervetncomnum data << r.gujianervethrunclcpct - data << r.gujia_tst_case_num - data << r.gujia_tst_comm_num + data << r.gujiabds_tst_case_num + data << r.gujiabds_tst_comm_num data << r.gujiatst_comm_num_pct data << r.gujia_ppe15_cvr_rate data << r.gujia_rto_mdn data << r.gujia_rto_lv_san_ceft - data << r.gujiamdl_tst_case_num - data << r.gujiamdl_tst_comm_num + data << r.gujiabdsmdltstcasenum + data << r.gujiabdsmdltstcommnum data << r.gujiamdltstcommnumpct data << r.gujiamdltst_ppe15_pct data << r.gujiamdlrtolvsan_ceft data << r.gujia_mdl_md_bit_rto - data << r.gujiatrdpttstcase_num - data << r.gujiatrdpttstcomm_num + data << r.gujiabdstrdpttcasenum + data << r.gujiabdstrdpttcommnum data << r.gujiatrdpttcommnumpct data << r.gujiatrdpttstppe15pct data << r.gujiatrdptrolvsanceft @@ -115,8 +115,8 @@ class ExportPgsqlEvaluationResult { for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_avprc,gujia_clc_tp_val,gujia_rlb,gujia_to_mkprc_mny, to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujia_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_wbt_floor,gujia_tot_floor,gujia_data_tp,gujia_rto,gujia_mns_rto, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm from "+database+"avm_evaluation_item_gj_h where gujia_clc_yrmo = ${yearMonth} AND urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_avprc,gujia_bds_clc_tp,gujia_bds_rlb,gujiabds_to_mkprc_mny,to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujiabds_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_bds_floor_num,gujiabdstot_floor_num,gujia_data_tp,gujia_rto,gujia_mns_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') AS data_crt_tm from "+database+"avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val = ${yearMonth} AND urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_fsid data << r.urbn_id @@ -125,19 +125,19 @@ class ExportPgsqlEvaluationResult { data << r.gujia_rgon_nm data << r.gujia_comm_id data << r.gujia_comm_nm - data << r.gujia_clc_yrmo - data << r.gujia_clc_avprc - data << r.gujia_avprc - data << r.gujia_clc_tp_val - data << r.gujia_rlb - data << r.gujia_to_mkprc_mny + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_avprc + data << r.gujia_bds_clc_tp + data << r.gujia_bds_rlb + data << r.gujiabds_to_mkprc_mny data << r.mdl_dt - data << r.gujia_valt_unitprc + data << r.gujiabds_valt_unitprc data << r.gujia_area data << r.gujia_dcrt_val data << r.gujia_twrd_val - data << r.gujia_wbt_floor - data << r.gujia_tot_floor + data << r.gujia_bds_floor_num + data << r.gujiabdstot_floor_num data << r.gujia_data_tp data << r.gujia_rto data << r.gujia_mns_rto @@ -161,15 +161,15 @@ class ExportPgsqlEvaluationResult { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,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_city_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,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_city_price_gj_h where gujiabds_clc_yrmo_val=${month} AND urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_trdpt_avprc_id data << r.urbn_id data << r.urbn_nm - data << r.gujia_clc_yrmo - data << r.gujia_clc_avprc - data << r.gujia_urbn_avprc + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc data << r.data_crt_tm data << r.data_udt_tm data << r.gujia_src_co @@ -188,18 +188,18 @@ class ExportPgsqlEvaluationResult { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,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_district_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'"; + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,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_district_price_gj_h where gujiabds_clc_yrmo_val=${month} AND urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_trdpt_avprc_id data << r.urbn_id data << r.urbn_nm data << r.gujia_admndiv_id data << r.gxda_admndiv_nm - data << r.gujia_clc_yrmo - data << r.gujia_clc_avprc - data << r.gujia_urbn_avprc + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc data << r.data_crt_tm data << r.data_udt_tm data << r.gujia_src_co @@ -219,8 +219,8 @@ class ExportPgsqlEvaluationResult { def allRows = [] for(def city : citys) { 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,gujia_clc_yrmo,gujia_clc_avprc,gujia_comm_basic_prc,gujia_clmtd_val,gujia_fwd_samp_rto,gujia_mns_grd,gujia_cfdrg,gujiaarndcommprc_crlt,gujia_cfdc_dgr_val,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 gujia_clc_yrmo=${yearMonth} AND urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + 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 gujiabds_clc_yrmo_val=${yearMonth} AND urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_bss_prc_id data << r.urbn_id @@ -229,15 +229,15 @@ class ExportPgsqlEvaluationResult { data << r.gujia_admndiv_nm data << r.gujia_bds_id data << r.comm_nm - data << r.gujia_clc_yrmo - data << r.gujia_clc_avprc + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc data << r.gujia_comm_basic_prc - data << r.gujia_clmtd_val - data << r.gujia_fwd_samp_rto - data << r.gujia_mns_grd - data << r.gujia_cfdrg - data << r.gujiaarndcommprc_crlt - data << r.gujia_cfdc_dgr_val + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr data << r.data_crt_tm data << r.data_udt_tm data << r.gujia_src_co @@ -264,9 +264,9 @@ class ExportPgsqlEvaluationResult { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bss_prc,gujia_cfdc_dgr_grd,gujiart3mlistgcasenum,gujialistgcaselwstprc,gujialistgcase_md_val,gujia_listg_case_avg,gujialistgcasemax_prc,gujiaavprc_crpnd_s_mo,gujiaavgwithminvalavg,gujiaavgwithmaxvalavg,gujia_rel_err,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujia_lmth_bss_prc,gujia_wthr_mnl_ind,gujia_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujianervethruntw_prc,gujia_prc_src,gujiaabtjanlcmdbitval,gujiaabtjanligcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujia_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujia_idxn_mo_moonmo,gujiaabt1yiminmmoonmo,gujia_idxn_yr_moonmo,gujiaabt1yr_samp_scvl,gujiaarnd1kscommavprc from "+database+"avm_community_p_describe_gj_h where gujiaavprc_crpnd_s_mo=${month} AND urbn_id='${cityCode}'"; + def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bds_bss_prc,gujiabds_cfdc_dgr_grd,gujiabdsrt3mlgcasenum,gujiabdslistgclwstprc,gujiabdslistgcaemdval,gujiabdslistgcase_avg,gujiabdslistgcemaxprc,gujia_bds_mo_val,gujiabdsavgwminvalavg,gujiabdsavgwmaxvalavg,gujia_bds_rel_err_val,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujiabds_lmth_bss_prc,gujiabds_wthr_mnl_val,gujiabds_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm,gujiabdsnervetuntwprc,gujia_prc_src,gujiabdsabtjlcmbitval,gujiabdsabtjlgcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujiabds_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujiabdsidxnmo_moonmo,gujiabdsa1yiminmmonmo,gujiabdsidxnyr_moonmo,gujiabdsat1yspdgrscor,gujiabdsarnd1kscavprc from "+database+"avm_community_p_describe_gj_h where gujia_bds_mo_val=${month} AND urbn_id='${cityCode}'"; - sqlInstance.eachRow(sql, { r -> + pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_fsid data << r.gujia_comm_id @@ -276,39 +276,39 @@ class ExportPgsqlEvaluationResult { data << r.gujia_admndiv_nm data << r.comm_nm data << r.gujia_als_dsc - data << r.gujia_bss_prc - data << r.gujia_cfdc_dgr_grd - data << r.gujiart3mlistgcasenum - data << r.gujialistgcaselwstprc - data << r.gujialistgcase_md_val - data << r.gujia_listg_case_avg - data << r.gujialistgcasemax_prc - data << r.gujiaavprc_crpnd_s_mo - data << r.gujiaavgwithminvalavg - data << r.gujiaavgwithmaxvalavg - data << r.gujia_rel_err + data << r.gujia_bds_bss_prc + data << r.gujiabds_cfdc_dgr_grd + data << r.gujiabdsrt3mlgcasenum + data << r.gujiabdslistgclwstprc + data << r.gujiabdslistgcaemdval + data << r.gujiabdslistgcase_avg + data << r.gujiabdslistgcemaxprc + data << r.gujia_bds_mo_val + data << r.gujiabdsavgwminvalavg + data << r.gujiabdsavgwmaxvalavg + data << r.gujia_bds_rel_err_val data << r.gujia_dvtdgr_dsc data << r.gujia_als_prc_rng data << r.gujiaprcminandmax_rng data << r.gujia_dsc - data << r.gujia_lmth_bss_prc - data << r.gujia_wthr_mnl_ind - data << r.gujia_lmth_fnl_prc + data << r.gujiabds_lmth_bss_prc + data << r.gujiabds_wthr_mnl_val + data << r.gujiabds_lmth_fnl_prc data << r.data_crt_tm - data << r.gujianervethruntw_prc + data << r.gujiabdsnervetuntwprc data << r.gujia_prc_src - data << r.gujiaabtjanlcmdbitval - data << r.gujiaabtjanligcaseavg + data << r.gujiabdsabtjlcmbitval + data << r.gujiabdsabtjlgcaseavg data << r.gujia_indx_lbl data << r.gujia_prim_pty_tp data << r.gujia_comm_tp_val - data << r.gujia_ltst_mdl_prc + data << r.gujiabds_ltst_mdl_prc data << r.gujia_ltst_mdl_dt - data << r.gujia_idxn_mo_moonmo - data << r.gujiaabt1yiminmmoonmo - data << r.gujia_idxn_yr_moonmo - data << r.gujiaabt1yr_samp_scvl - data << r.gujiaarnd1kscommavprc + data << r.gujiabdsidxnmo_moonmo + data << r.gujiabdsa1yiminmmonmo + data << r.gujiabdsidxnyr_moonmo + data << r.gujiabdsat1yspdgrscor + data << r.gujiabdsarnd1kscavprc allRows << data }); } @@ -322,27 +322,26 @@ class ExportPgsqlEvaluationResult { } for(def city : citys){ def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and crterm=${month}"; + def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,gujia_bds_crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and gujia_bds_crterm=${month}"; def allRows = [] - sqlInstance.eachRow(sql,{r-> + pgsqlInstance.eachRow(sql,{r-> def data = [] data << r.gujia_fsid data << r.urbn_id data << r.gujia_comm_id data << r.gujia_case_id - data << r.crterm + data << r.gujia_bds_crterm data << r.data_crt_tm allRows << data - if(allRows.size()%200000==0){ - FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); - allRows.clear() - } +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); +// allRows.clear() +// } }); - if(allRows.size()>0){ - FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); - } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); } - CcbFtpUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) } def exportMd5(){ @@ -379,7 +378,9 @@ class ExportPgsqlEvaluationResult { fileName = win_prefix + "${curDate}.ok" } - createFileToFtp("ok txt",fileRows, fileName, curDate, false) + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "ok文件上传Ftp完成......" }