This commit is contained in:
2021-04-14 09:46:07 +08:00
parent 1196cee874
commit a991d8cd4a
6 changed files with 221 additions and 13 deletions
@@ -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
@@ -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<houses.size();k++) {
println k
@@ -0,0 +1,182 @@
package com.fangjia.script.gj.test
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.util.GeoHelper
import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils
import com.fangjia.core.util.BaiDuApiUtils
import com.mongodb.BasicDBObject
import com.fangjia.script.util.DbUtils
class FZloationUpdate {
static main(args) {
def task = new FZloationUpdate();
task.run()
}
def run(){
def districts = CommonDatautils.findAllDistricts("福州", "district", ["city", "region","name","address","lat","lng"]);
def index = 0
def locationMap = getMoreSameLocationDist(districts)
def total = 0
locationMap.each {k,v->
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<districts.size();i++){
def dist = districts[i]
def lat = dist.lat/10000000000.0;
def lng = dist.lng/10000000000.0;
def locationKey = lng + "-" + lat
def list = locationMap.get(locationKey)
if(!list){
list = []
locationMap.put(locationKey, list);
}
list << dist
}
def resMap = [:]
locationMap.each{k,v->
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<v.size();i++){
def d = v[i]
if(i==0){
if(d.name.contains("期")||d.name.contains("区")){
swname = d.name.replace("一期","").replace("二期","").replace("三期","").replace("四期","").replace("五期","").replace("六期","").replace("一区","").replace("二区","").replace("三区","").replace("四区","").replace("五区","").replace("A区","").replace("B区","").replace("C区","").replace("D区","")
}else{
swname = d.name
}
}else{
if(d.name.contains(swname)||swname.contains(d.name)){
count++
}
}
}
if(count+1!=v.size()){
lastRetMaps.put(k,v)
}
}
return lastRetMaps;
}
def deleteRegion(def s, def region){
def key = ""
if(s.indexOf(region)>-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;
}
}
@@ -0,0 +1,4 @@
package com.fangjia.script.gj.test
class FzLocationBatch {
}
@@ -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);
}
}
@@ -0,0 +1,3 @@
package com.fangjia.script.gj.test
println "wwww"