From 6d9d4b061a48fa0f7e394b9eb0b6eeb835bb9001 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 22 Aug 2024 12:18:43 +0800 Subject: [PATCH] update --- .../gj/data_handle/DevUpdateTestBatch.groovy | 5 +- .../script/gj/data_handle/MinglujiData.groovy | 179 +++++++++++++----- 2 files changed, 132 insertions(+), 52 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy index 052f2d046..84d14b8e0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevUpdateTestBatch.groovy @@ -31,9 +31,12 @@ class DevUpdateTestBatch { def task = new DevUpdateTestBatch() def path = "D:\\数据\\数据建设\\开发区\\开发区-园区.xlsx"//开发区-园区.xlsx // task.addDev(path) - task.addDevAddress(path) +// task.addDevAddress(path) // task.updateHasGov("新疆维吾尔自治区","喀什地区","麦盖提县", "麦盖提镇", "是") + + + } def addDev(path){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy index 3f489e8cf..3ced98380 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy @@ -1,9 +1,11 @@ package com.fangjia.script.gj.data_handle +import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import com.rabbitmq.client.impl.AMQImpl import java.util.regex.Pattern @@ -19,17 +21,25 @@ class MinglujiData { DBCollection dev_mapping_CONN = MongoUtils.getCollectionByName2("fangjia", "dev_mapping", MONGO100_URL) DBCollection community_100_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) + + DBCollection company_100_CONN = MongoUtils.getCollectionByName2("fangjia", "company", MONGO100_URL) + static main(args) { def task = new MinglujiData() task.run() } def run(){ - exportDatas("嘉兴") -// matchDev("浙江省","湖州") -// matchCommunity("湖州") + def prov = "浙江省" + def city = "嘉兴" +// exportDatas(city) +// matchDev(prov, city) + matchCommunity(city) -// tempMatchDev("浙江省") +// tempMatchDev(prov) + + +// saveMljData() } def exportDatas(city){ def datas = findMinglujiDatas(city) @@ -37,35 +47,70 @@ class MinglujiData { } def matchDev(prov, city){ def devs = loadAllDevs(prov) - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\${city}.xlsx",{d-> - if(d['E'] && !d['N'] ){ - def obj = findDevByName(d['E']) - if(!obj){ - obj = findDevByAlias(d['E']) + + def i = 1; + while(i<20) { + def fileName = "/home/goojia/gj/mlj_${i}.xlsx" + if (CommonDatautils.isWindow()) { + fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + } + ExcelUtils.multiThreadingModify(fileName,{d-> + if(d['D']){ + def street = d['D'] + def splitStreet = "" + if(street){ + if(street.contains(d['C'])){ + def start = street.toString().lastIndexOf(d['C'])+d['C'].size() + def end = street.toString().size() + splitStreet = street.toString().substring(start, end) + }else{ + splitStreet = street + } + } + d['K'] = splitStreet + } + + if(d['I']){ + def splitCommunity = "" + if(d['C'] && d['I'].toString().contains(d['C'])){ + splitCommunity = d['I'].toString().substring(d['I'].toString().lastIndexOf(d['C'])+d['C'].toString().size(), d['I'].toString().size()) + }else{ + splitCommunity = d['I'] + } + d['L'] = splitCommunity + } + + + if(d['E'] && !d['N'] ){ + def obj = findDevByName(d['E']) if(!obj){ - obj = findDebBySimlar(devs, d['E'], d['B']) + obj = findDevByAlias(d['E']) if(!obj){ + obj = findDebBySimlar(devs, d['E'], d['B']) + if(!obj){ obj = findDevByPark(d['A'], d['B'], d['E']) if (!obj) { }else{ d['N'] = "园区" } + }else{ + d['N'] = "相似" + } }else{ - d['N'] = "相似" + d['N'] = "别名" } }else{ - d['N'] = "别名" + d['N'] = "相同" + } + if(obj){ + d['M'] = obj.name + d['O'] = obj.city + d['P'] = obj.district } - }else{ - d['N'] = "相同" } - if(obj){ - d['M'] = obj.name - d['O'] = obj.city - d['P'] = obj.district - } - } - }) + }) + } + } def tempMatchDev(prov){ @@ -102,39 +147,71 @@ class MinglujiData { } def matchCommunity(city){ - ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\${city}-没配居委1.xlsx",{d-> - if(d['A'] && d['B'] && d['L'] && !d['Q']){ - def list = findCommunityByName(d['A'], d['B'], d['L']) - if(!list){ - list = findCommunityBySimlar(d['A'], d['B'], d['L']) - if(!list){ + def i = 0; + while(i<20){ + def fileName = "/home/goojia/gj/mlj_${i}.xlsx" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + } - }else{ - d['T'] = "包含" - } - }else{ - d['T'] = "相同" - } - if(list){ - if(list.size()==1){ - def obj = list[0] - d['Q'] = obj.name - d['R'] = obj.street_name - }else if(list.size()>=2){ - for(def l : list){ - if(d['C']==l.area_name){ - d['Q'] = l.name - d['R'] = l.street_name - break; - } - } - d['S'] = list.size() - } - } - } - }, 0) + File file=new File(fileName); + if(file.exists()){ + ExcelUtils.multiThreadingModify(fileName,{d-> + if(d['A'] && d['B'] && d['L'] && !d['Q']){ + def list = findCommunityByName(d['A'], d['B'], d['L']) + if(!list){ + list = findCommunityBySimlar(d['A'], d['B'], d['L']) + if(!list){ + + }else{ + d['T'] = "包含" + } + }else{ + d['T'] = "相同" + } + if(list){ + if(list.size()==1){ + def obj = list[0] + d['Q'] = obj.name + d['R'] = obj.street_name + d['U'] = obj.area_name + d['V'] = obj.city_name + }else if(list.size()>=2){ + for(def l : list){ + if(d['C']==l.area_name){ + d['Q'] = l.name + d['R'] = l.street_name + d['U'] = l.area_name + d['V'] = l.city_name + break; + } + } + d['S'] = list.size() + } + } + } + }, 0) + println fileName +" 远行完成" + } + + } } + + def saveMljData(){ + ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州入库数据.xlsx",{d-> + def obj = new BasicDBObject() + obj.put("province", d['A']) + obj.put("city", d['B']) + obj.put("district", d['C']) + obj.put("name", d['D']) + obj.put("address", d['E']) + obj.put("dev_name", d['F']) + obj.put("committee", d['G']) + obj.put("street", d['H']) + company_100_CONN.save(obj) + }) + } def loadAllDevs(prov){ def q = new BasicDBObject() q.put("province", prov)