From bd38b035251630e0ac6e8940007fa343356ba08c Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 10 Oct 2022 09:16:38 +0800 Subject: [PATCH] update --- .../fangjia/script/ccbevaluation/CcbFtpUtils.groovy | 2 +- .../ronghe/ExportDistrictRongHe.groovy | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy index 1f5f377ce..6b972553e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy @@ -7,7 +7,7 @@ import org.apache.commons.codec.digest.DigestUtils class CcbFtpUtils { - static def ftpServer = "192.168.0.86"//192.168.0.45 + static def ftpServer = "192.168.0.45"//192.168.0.45 static def ftpPort = 17495 static def ftpUser = "ccb" static def ftpPassword = "ccb!@#" 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 6a8b5cc29..fa398bbc5 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 @@ -22,6 +22,7 @@ class ExportDistrictRongHe extends BaseBatch{ runBatch(new ExportDistrictRongHe(), args); } + def citys = CcbCommonUtils.citys def cityCodeMap = CcbCommonUtils.findCityCodeValue() @Override @@ -97,7 +98,7 @@ class ExportDistrictRongHe extends BaseBatch{ // } def exportBigdataCommunityGJRH(){ - def citys = CcbCommonUtils.citys_all + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ @@ -148,7 +149,6 @@ class ExportDistrictRongHe extends BaseBatch{ println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......" } def exportBigdataCommbuildstruGJ(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -178,7 +178,6 @@ class ExportDistrictRongHe extends BaseBatch{ def exportBigdataCommhousetypeGJ(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -207,7 +206,6 @@ class ExportDistrictRongHe extends BaseBatch{ } def exportBigdataCommbuildyearGj(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -237,7 +235,6 @@ class ExportDistrictRongHe extends BaseBatch{ def exportBigdataCommfeeGj(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys){ def cityCode = cityCodeMap.get(city) @@ -276,7 +273,6 @@ class ExportDistrictRongHe extends BaseBatch{ def exportBigdataCommhouseuseGJ(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -306,7 +302,6 @@ class ExportDistrictRongHe extends BaseBatch{ } def exportBigdataPositionGJ(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -340,7 +335,6 @@ class ExportDistrictRongHe extends BaseBatch{ } def exportBigdataDistrictFJW(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -373,7 +367,6 @@ class ExportDistrictRongHe extends BaseBatch{ } def exportBigdataAliasFJW(){ - def citys = CcbCommonUtils.citys_all def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) @@ -530,7 +523,6 @@ class ExportDistrictRongHe extends BaseBatch{ def allRows = [] - def citys = CcbCommonUtils.citys_all for(def city : citys) { def cityCode = cityCodeMap.get(city) if(curDate.toString().endsWith("28")){ @@ -729,7 +721,6 @@ class ExportDistrictRongHe extends BaseBatch{ if(CommonDatautils.isWindow()){ fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } - def citys = CcbCommonUtils.citys_all def index = 0 for(def city : citys) {