diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index 4e70b43c8..52fd3ddb2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -47,15 +47,7 @@ class ThirdPartyPriceBatch extends BaseBatch { @Override public void process(Object args) { -// def gocPrices = CcbCommonUtils.findDistGovPrice("深圳") -// def sql = "delete from base.t0831_bigdata_third_party_price_gj_h where gujiabds_avprc_dt_val=202303 and gujia_bds_id=?" -// pgsqlInstance.withBatch(500, sql){ ps-> -// for(def id : gocPrices){ -// ps.addBatch(id) -// } -// } -// - def citys = ["上海","广州"]//CcbCommonUtils.getRunningCitys(args) + def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] def index = 0 def weekend = DateUtils.getFirstDayOfWeek(DateUtils.parseFromTightByPattern(sDate+"15", "yyyyMMdd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy index 2003b4c4b..4dbf6a57c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy @@ -32,14 +32,14 @@ class DevProcess { def task = new DevProcess(); // task.run() // task.parseCityAndDist() - task.devSplitRoad() +// task.devSplitRoad() // task.devNameSplitRoad() // task.addFlag() // task.matchDev() // task.calAddrDistince() // task.updateCityAndDist() -// task.addDevAddres1() //按添加地址中包含开发区名称的地址 + task.addDevAddres1() //按添加地址中包含开发区名称的地址 // task.addDevAddres2()//添加相差2公里范围内的地址 // task.matchDevAndAddAddress() @@ -644,10 +644,10 @@ class DevProcess { def matchDevAndAddAddress(){ - ExcelUtils.modify("D:\\数据\\数据建设\\浙江-湖州路正常(2.6+15万修正).xlsx",{d-> - if(d['R']){ + ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\新跑省份\\福建去重地址入库.xlsx",{d-> + if(d['J']){ def q = new BasicDBObject() - q.put("name", d['R']) + q.put("name", d['J']) def obj = development_zone_CONN.findOne(q) if(obj){ @@ -671,6 +671,7 @@ class DevProcess { udata.put("name",obj.name) udata.put("type", "地址") udata.put("address",address) + udata.put("c_date", new Date()) // udata.put("type", "乡镇街道") // udata.put("township", street) DEV_MAPPING_CONN.save(udata) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy index 60d12e13b..b11210d3e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy @@ -137,9 +137,10 @@ class GXDdistrictMatch { } def runMatch(){ - def fileName = "D:\\数据\\福州\\福州贝壳数据.xlsx"//11城重新匹配.xlsx - def city = "福州" - ExcelUtils.modify(fileName, { d -> + def fileName = "D:\\数据\\福州\\建行测试匹配.xlsx"//11城重新匹配.xlsx 福州贝壳数据.xlsx + + ExcelUtils.multiThreadingModify(fileName, { d -> + def city = d['A'] println d['C'] if(d['B'] && d['A']){ def region = RegionData.formatRegion(city, d['B'])