diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy index cbf7ef9e6..f1f8918e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/AbcEvaluationRowsBatch.groovy @@ -121,15 +121,15 @@ class AbcEvaluationRowsBatch extends BaseBatch{ houseLoudng.fitment_cost = ret.fitment_charge houseLoudng.car_port = ret.carport houseLoudng.house_height = ret.house_hight - houseLoudng.worry_facility" : null, - houseLoudng.fitment_age = ret.fitment_age - houseLoudng.lighting_ventilation" : null, - houseLoudng.build_type = ret.build_type - houseLoudng.house_property" : null, - houseLoudng.noise" : null, - houseLoudng.sight" : null, - houseLoudng.fitment_rank" : null, - houseLoudng.sideset" : null, +// houseLoudng.worry_facility" : null, +// houseLoudng.fitment_age = ret.fitment_age +// houseLoudng.lighting_ventilation" : null, +// houseLoudng.build_type = ret.build_type +// houseLoudng.house_property" : null, +// houseLoudng.noise" : null, +// houseLoudng.sight" : null, +// houseLoudng.fitment_rank" : null, +// houseLoudng.sideset" : null, houseLoudng.district_no = district._id diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy index be42a6ee6..589ad68fc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy @@ -31,8 +31,8 @@ class EsHouseStat { public static void main(String[] args){ def task = new EsHouseStat(); //task.run(); - task.testRun("常州") -// task.exportOpenLog(); +// task.testRun("常州") + task.exportOpenLog(); // task.exportPoi(); } @@ -125,7 +125,7 @@ class EsHouseStat { QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007713')).must(QueryBuilders.termQuery("request_uri", '/property/evaluate')).must(QueryBuilders.termQuery("code", 200)) def rets = [] def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "open_uri_log", queryBuilder); - def curDate = DateUtils.parseFromTightByPattern("2020-07-01", "yyyy-MM-dd") + def curDate = DateUtils.parseFromTightByPattern("2020-09-01", "yyyy-MM-dd") if(houses){ for (int k=0;k + total = updateLocation(v, total); + println "---------------------------------------------------------------------------------------------------------------" + } + } + + def updateLocation(def lists, def total){ + + + for(def dist : lists){ + + def addrDistMap = getLocation(dist, dist.address) + def nameDistMap = getLocation(dist, dist.region + dist.name) + + if((addrDistMap && addrDistMap.distance>1000) && (nameDistMap && nameDistMap.distance>1000)){ + println dist.region +" "+dist.name+" "+dist.address+" addrDist:"+(addrDistMap!=null?addrDistMap.distance:"")+" addrKey:"+(addrDistMap!=null?addrDistMap.keyword:"")+" nameDist:"+(nameDistMap!=null?nameDistMap.distance:"")+" nameKey:"+(nameDistMap!=null?nameDistMap.keyword:"") + // println "[${index}]"+ dist.region+" "+dist.name+" "+dist.address+" addrDist:"+addrDistMap.distance+"(${addrDistMap.level}-${addrDistMap.location}-${addrDistMap.keyword}) nameDist:"+nameDistMap.distance+"(${nameDistMap.level}-${nameDistMap.location}-${nameDistMap.keyword})" + + if(addrDistMap){ + def addrKey = deleteRegion(addrDistMap.keyword, dist.region).replace("|",""); + def nameKey = deleteRegion(nameDistMap.keyword, dist.region); + + def baidu = null + def lat = null + def lng = null + def upldateFlag = "" + if(addrDistMap && addrDistMap.region.contains(dist.region) && (addrKey.contains("路") || addrKey.contains("大道")) && addrKey.contains("号") && dist.addr == addrKey){ + lat = addrDistMap.lat + lng = addrDistMap.lng + baidu = BaiDuApiUtils.geoconv(lng, lat, 3) + upldateFlag = "Address" + }else if(nameDistMap && nameDistMap.region.contains(dist.region) && nameKey == dist.name){ + lng = nameDistMap.lng + lat = nameDistMap.lat + baidu = BaiDuApiUtils.geoconv(lng, lat, 3) + upldateFlag = "Name" + } + if(baidu){ + total++ + def udata = new BasicDBObject() + udata.put("m_date", new Date()) + Long baiduLat = baidu.y*10000000000L + Long baiduLng = baidu.x*10000000000L + udata.put("lat2", baiduLat) + udata.put("lng2", baiduLng) + Long lat0 = lat*10000000000L + Long lng0 = lng*10000000000L + udata.put("lat", lat0) + udata.put("lng", lng0 ) + DbUtils.seaweed.update(new BasicDBObject("_id", dist._id), new BasicDBObject('$set', udata)) + println "[修改-${total}] "+ dist.region+" "+dist.name+" "+dist.address+" "+upldateFlag + } + + } + } + } + return total + } + + def getMoreSameLocationDist(def districts){ + def locationMap = [:] + for(def i=0;i + if(v.size()>=2){ + + v.sort{ a,b-> + return a.name.size().compareTo(b.name.size()) + } + resMap.put(k,v) + } + } + + def lastRetMaps = [:] + resMap.each{k,v-> + def swname = null + def count = 0 + for(def i=0;i-1){ + if(s.indexOf(region+"区")>-1){ + key = s.substring(s.indexOf(region+"区")+region.size()+1, s.size()); + }else if(s.indexOf(region+"县")>-1){ + key = s.substring(s.indexOf(region+"县")+region.size()+1, s.size()); + }else if(s.indexOf(region+"市")>-1){ + key = s.substring(s.indexOf(region+"市")+region.size()+1, s.size()); + } + }else{ + key = s; + } + return key + } + + + + def getLocation(dist, addr){ + + if(addr){ + def rMap = [:] + def reps = GaoDeApiUtils.geo(dist.city, addr); + if(reps && reps.count.toInteger()>=1){ + def map = reps.geocodes.get(0) + def location = map.location + def level = map.level + if(location){ + def locMap = location.split(",") + def lat = dist.lat/10000000000.0; + def lng = dist.lng/10000000000.0; + def distance = GeoHelper.GetDistance(locMap[1].toDouble(), locMap[0].toDouble(), lat, lng) + rMap.distance = distance + rMap.level = level + rMap.lat = locMap[1].toDouble() + rMap.lng = locMap[0].toDouble() + rMap.keyword = map.formatted_address + rMap.location = location + rMap.region = map.district + return rMap; + } + } + } + return null; + } + + + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzLocationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzLocationBatch.groovy new file mode 100644 index 000000000..4345374e2 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/FzLocationBatch.groovy @@ -0,0 +1,4 @@ +package com.fangjia.script.gj.test + +class FzLocationBatch { +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy index cc5c8b7b3..838fcbd20 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/JiangShuBlankDataStat.groovy @@ -30,7 +30,9 @@ class JiangShuBlankDataStat { // task.matchHouse(); // task.villa() - task.addressParse() +// task.addressParse() + + task.deleteProcess() } def repeat(){ @@ -288,5 +290,22 @@ class JiangShuBlankDataStat { return floor; } + def deleteProcess(){ + + def datas = ExcelUtils.read("D:\\数据\\江苏农行\\江苏2千.xlsx",0,1) + def addrList = [] + for(def d : datas){ + def addr = d['G'] + addrList << addr + } + ExcelUtils.multiThreadingModify("D:\\数据\\江苏农行\\200平以下.xlsx", { row -> + def addr = row['C'] + if(addrList.contains(addr)){ + row['R'] = "已调查" + } + + },0); + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy new file mode 100644 index 000000000..1a1f3fb66 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy @@ -0,0 +1,3 @@ +package com.fangjia.script.gj.test + +println "wwww" \ No newline at end of file