From a528f7ed9ff188ef7c0a31ef1b24f5f7d47a5016 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sun, 26 May 2024 16:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E6=BA=90=E8=BF=87=E6=BB=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealAndThirdPriceDataProcess.groovy | 2 +- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 2 +- .../script/gj/data_handle/DevProcess.groovy | 18 +++++++++--------- .../FjwBigdataForsaleBatch.groovy | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index 023cc157d..5072828fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -389,7 +389,7 @@ class DealPriceDataProcess { def deleteThirdPartyData(){ // ,"陵水","塔城","保亭","长沙","苏州","南昌","沧州","文昌","衡水" // def citys = ["310000","440100","500000","410100","430100","330100","340100","320100","370200","320500","120000","442000","320300","350200","360100","320400","210200","530100","469005","469028","469029","230700","610700","533400","650400","511100","131100"]//CcbCommonUtils.citys_all - def citys = CcbCommonUtils.citys_all + def citys = ["上海","广州"]//CcbCommonUtils.citys_all def month = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));//上个月日期 def rows = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() 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 b0756a439..4e70b43c8 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 @@ -55,7 +55,7 @@ class ThirdPartyPriceBatch extends BaseBatch { // } // } // - 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 7c1a06a58..5f59e63b5 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 @@ -29,10 +29,10 @@ class DevProcess { def task = new DevProcess(); // task.run() // task.parseCityAndDist() - task.devSplitRoad() +// task.devSplitRoad() // task.devNameSplitRoad() // task.addFlag() -// task.matchDev() + task.matchDev() // task.calAddrDistince() // task.updateCityAndDist() @@ -168,10 +168,10 @@ class DevProcess { def devSplitRoad(){ def i = 0; - while(i<14){ + while(i<1){ def fileName = "/home/goojia/gj/zhejiang-${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\开发区\\浙江\\zhejiang_0.xlsx" + fileName = "D:\\数据\\数据建设\\浙江-湖州.xlsx" } ExcelUtils.multiThreadingModify(fileName,{d-> /*if(d['C'] && !d['V']){ @@ -295,14 +295,14 @@ class DevProcess { } def matchDev(){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\开发区\\统计局区域的开发区匹配省级以上.xlsx",{d-> - if(!d['F']){ + ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\浙江-湖州路正常(2.6+15万).xlsx",{d-> + if(!d['N']){ def q = new BasicDBObject() - q.put("name", d['C']) + q.put("name", d['L']) def obj = development_zone_CONN.findOne(q) if(obj){ - d['F'] = obj._id.toString() - d['G'] = obj.name + d['N'] = obj._id.toString() + d['O'] = obj.name } } },0); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy index 42a11b53a..f9352149c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy @@ -133,7 +133,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ println city +" 小区量:"+districts.size() - + BloomFilter curhousefilter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); def retMap = new ConcurrentHashMap() for(def i=0;i