From 00fee9313f2130b7ad8fe20ee62dabdf892bc869 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 15 Jan 2024 15:40:47 +0800 Subject: [PATCH] =?UTF-8?q?Suggestion=E4=B9=A1=E9=95=87=E8=A1=97=E9=81=93?= =?UTF-8?q?=E4=BB=8Emap=5Fpoi=E4=B8=AD=E6=9F=A5=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealAndThirdPriceDataProcess.groovy | 4 +- .../com/fangjia/script/gj/OpenApiUtils.groovy | 113 ++++++++++++------ .../village/BaiduCoordinateConverter.groovy | 86 +++++++++++++ .../gj/village/communityLocation.groovy | 54 +++++++-- .../gj/xiamen/SuggestionDataSynch.groovy | 24 +++- 5 files changed, 229 insertions(+), 52 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy 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 60f1450a6..d408f306a 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 @@ -28,8 +28,8 @@ class DealPriceDataProcess { def task = new DealPriceDataProcess() // task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据 // task.addLianJiaPrice(); -// task.deleteThirdPartyData()//删除第三方 - task.delDealByPe() + task.deleteThirdPartyData()//删除第三方 + task.delDealByPe()//删除成交 // task.delDealData() // task.exportThirdParty() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index c187c2214..5fd8cdf21 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -6,6 +6,7 @@ import com.fangjia.core.util.BaiDuApiUtils import com.fangjia.core.util.CNNMFilter import com.fangjia.core.util.GeocodeUtils import com.fangjia.core.util.HttpRequest +import com.fangjia.script.gj.village.BaiduCoordinateConverter import com.fangjia.script.util.CosineSimilarAlgorithm import net.sf.json.JSONObject import net.sf.json.groovy.JsonSlurper @@ -389,49 +390,32 @@ class OpenApiUtils { for (def loc : json.content) { String name = formatName(address) if(loc.uid) { - def bean = [:] JSONObject uidInfo = BaiDuApiUtils.getDetailByUid(loc.uid) if(uidInfo != null) { - def baiduRegion = uidInfo.get("result").area - def baiduCity = uidInfo.get("result").city + rets = createData(rets, uidInfo, loc, region, name, address) + }else{ + def baiduRegion = loc.area_name.replace(loc.city_name,"") + def baiduCity = loc.city_name baiduCity = RegionData.formatCity(baiduCity) - def newName = formatName(loc.name) - if(baiduRegion.contains(region) && (name== newName || address==newName)){ - JSONObject result = uidInfo.get("result") - JSONObject lo = result.get("location") - Double lng2 = lo.get("lng") - Double lat2 = lo.get("lat") - bean.lng2 = lng2 - bean.lat2 = lat2 + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(score1 || score2){ + def bean = [:] bean.name = loc.name bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion - def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) - def lng = gmap.get("lng") - def lat = gmap.get("lat") - bean.lng = lng - bean.lat = lat - if(result.get("detail_info")){ - bean.estateType = result.get("detail_info").get("tag") + def locArrs = BaiduCoordinateConverter.bdMercator2Latlng(loc.diPointX/100.0, loc.diPointY/100.0) + if(locArrs){ + def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0], locArrs[1]) + bean.lng = gmap.get("lng") + bean.lat = gmap.get("lat") } - - if(bean.estateType && (bean.estateType.contains('出入口') || bean.estateType.contains('公交车站'))){ - println "X百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】-${bean.estateType}" - }else{ - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】" - rets << bean; - } - + bean.estateType = loc.std_tag + rets << bean; + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" }else{ - def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); - def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); - if(score1 || score2){ - rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" - }else{ - println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" - } + println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" } } } @@ -444,6 +428,67 @@ class OpenApiUtils { return rets; } + def static createData(def rets, def uidInfo, def loc, region, name, address){ + def bean = [:] + def baiduRegion = uidInfo.get("result").area + def baiduCity = uidInfo.get("result").city + baiduCity = RegionData.formatCity(baiduCity) + def newName = formatName(loc.name) + if(baiduRegion.contains(region) && (name== newName || address==newName)){ + JSONObject result = uidInfo.get("result") + JSONObject lo = result.get("location") + Double lng2 = lo.get("lng") + Double lat2 = lo.get("lat") + bean.lng2 = lng2 + bean.lat2 = lat2 + bean.name = loc.name + bean.address = loc.addr.replace("[]","") + bean.city = baiduCity + bean.region = baiduRegion + def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) + def lng = gmap.get("lng") + def lat = gmap.get("lat") + bean.lng = lng + bean.lat = lat + if(result.get("detail_info")){ + bean.estateType = result.get("detail_info").get("tag") + } + + if(bean.estateType && (bean.estateType.contains('出入口') || bean.estateType.contains('公交车站'))){ + println "X百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】-${bean.estateType}" + }else{ + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】" + rets << bean; + } + + }else{ + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(score1 || score2){ + + JSONObject result = uidInfo.get("result") + JSONObject lo = result.get("location") + bean.lng2 = lo.get("lng") + bean.lat2 = lo.get("lat") + bean.name = loc.name + bean.address = loc.addr.replace("[]","") + bean.city = baiduCity + bean.region = baiduRegion + def gmap = GeocodeUtils.geoconvBaiduToGoogle(bean.lng2, bean.lat2) + bean.lng = gmap.get("lng") + bean.lat = gmap.get("lat") + if(result.get("detail_info")){ + bean.estateType = result.get("detail_info").get("tag") + } + rets << bean; + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + }else{ + println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" + } + } + return rets; + } + def static formatName(String name) { if(name.indexOf("·") != -1) { name = name.replaceAll("·", "") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy new file mode 100644 index 000000000..7dcc6a199 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy @@ -0,0 +1,86 @@ +package com.fangjia.script.gj.village +import java.util.Arrays; +class BaiduCoordinateConverter { + + static double[] array1 = [75, 60, 45, 30, 15, 0] + static double[][] array2 = [ + [-0.0015702102444, 111320.7020616939, 1704480524535203.0, -10338987376042340.0, 26112667856603880.0, -35149669176653700.0, 26595700718403920.0, -10725012454188240.0, 1800819912950474.0, 82.5], + [0.0008277824516172526, 111320.7020463578, 647795574.6671607, -4082003173.641316, 10774905663.51142, -15171875531.51559, 12053065338.62167, -5124939663.577472, 913311935.9512032, 67.5], + [0.00337398766765, 111320.7020202162, 4481351.045890365, -23393751.19931662, 79682215.47186455, -115964993.2797253, 97236711.15602145, -43661946.33752821, 8477230.501135234, 52.5], + [0.00220636496208, 111320.7020209128, 51751.86112841131, 3796837.749470245, 992013.7397791013, -1221952.21711287, 1340652.697009075, -620943.6990984312, 144416.9293806241, 37.5], + [-0.0003441963504368392, 111320.7020576856, 278.2353980772752, 2485758.690035394, 6070.750963243378, 54821.18345352118, 9540.606633304236, -2710.55326746645, 1405.483844121726, 22.5], + [-0.0003218135878613132, 111320.7020701615, 0.00369383431289, 823725.6402795718, 0.46104986909093, 2351.343141331292, 1.58060784298199, 8.77738589078284, 0.37238884252424, 7.45] + ] + static double[] array3 = [12890594.86, 8362377.87, 5591021, 3481989.83, 1678043.12, 0]; + static double[][] array4 = [ + [1.410526172116255e-8, 0.00000898305509648872, -1.9939833816331, 200.9824383106796, -187.2403703815547, 91.6087516669843, -23.38765649603339, 2.57121317296198, -0.03801003308653, 17337981.2], + [-7.435856389565537e-9, 0.000008983055097726239, -0.78625201886289, 96.32687599759846, -1.85204757529826, -59.36935905485877, 47.40033549296737, -16.50741931063887, 2.28786674699375, 10260144.86], + [-3.030883460898826e-8, 0.00000898305509983578, 0.30071316287616, 59.74293618442277, 7.357984074871, -25.38371002664745, 13.45380521110908, -3.29883767235584, 0.32710905363475, 6856817.37], + [-1.981981304930552e-8, 0.000008983055099779535, 0.03278182852591, 40.31678527705744, 0.65659298677277, -4.44255534477492, 0.85341911805263, 0.12923347998204, -0.04625736007561, 4482777.06], + [3.09191371068437e-9, 0.000008983055096812155, 0.00006995724062, 23.10934304144901, -0.00023663490511, -0.6321817810242, -0.00663494467273, 0.03430082397953, -0.00466043876332, 2555164.4], + [2.890871144776878e-9, 0.000008983055095805407, -3.068298e-8, 7.47137025468032, -0.00000353937994, -0.02145144861037, -0.00001234426596, 0.00010322952773, -0.00000323890364, 826088.5] + ]; + + public static double[] convertor(double x, double y, double[] param) { + double t = param[0] + param[1] * Math.abs(x); + double cc = Math.abs(y) / param[9]; + double cf = param[2] + param[3] * cc + param[4] * cc * cc + param[5] * cc * cc * cc + param[6] * cc * cc * cc * cc + param[7] * cc * cc * cc * cc * cc + param[8] * cc * cc * cc * cc * cc * cc; + t *= (x < 0) ? -1 : 1; + cf *= (y < 0) ? -1 : 1; + return [t, cf]; + } + + public static double[] bdLatlng2Mercator(double lat, double lng) { + double[] arr = null; + double nLat = (lat > 74) ? 74 : lat; + nLat = (nLat < -74) ? -74 : nLat; + for (int i = 0; i < array1.length; i++) { + if (lat >= array1[i]) { + arr = array2[i]; + break; + } + } + if (arr == null) { + for (int i = array1.length - 1; i >= 0; i--) { + if (lat <= -array1[i]) { + arr = array2[i]; + break; + } + } + } + if (arr == null) { + throw new IllegalArgumentException("Invalid latitude"); + } + double[] res = convertor(lng, lat, arr); + return [res[0], res[1]] + } + + public static double[] bdMercator2Latlng(double x, double y) { + double[] arr = null; + double npX = Math.abs(x); + double npY = Math.abs(y); + for (int i = 0; i < array3.length; i++) { + if (npY >= array3[i]) { + arr = array4[i]; + break; + } + } + if (arr == null) { + throw new IllegalArgumentException("Invalid y value"); + } + double[] res = convertor(npX, npY, arr); + return [res[0], res[1]] + } + + public static void main(String[] args) { + // Example usage + double latitude = 4832281.76 + double longitude = 12959065.3 + +// double[] mercatorPoint = bdLatlng2Mercator(latitude, longitude); +// System.out.println("Mercator Point: " + Arrays.toString(mercatorPoint)); + + double[] latlngPoint = bdMercator2Latlng(longitude, latitude); + System.out.println("Latlng Point: " + Arrays.toString(latlngPoint)); + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index bb7993201..614af517f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -1,25 +1,55 @@ package com.fangjia.script.gj.village +import com.fangjia.core.RegionData +import com.fangjia.core.util.DataUtil import com.fangjia.script.gj.OpenApiUtils import com.fangjia.script.util.ExcelUtils -filePath = "D:\\数据\\涉农\\2023居委相同包含.xlsx" +def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] +//def name = "台基厂社区居委会" +//def region = "东城区" +//def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); + +filePath = "D:\\数据\\涉农\\无经纬度居委_0.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> - def poiName = d['N'] - def locstr = d['O'] - try{ - def name = poiName.substring(poiName.indexOf(" ")+4, poiName.indexOf("\n")) - def location = locstr.substring(locstr.indexOf("{"), locstr.indexOf("}")+1) - }catch(e){ - println "错误:"poiName + + if(!d['N']){ + def city = d['D'] + def region = d['F'] + def name = d['J'] + def code = codeMap.get(city); + if(!code){ + code = codeMap.get(RegionData.formatCity(city)); + } + if(code){ + def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); + println name +" "+rets.size() + for(def r : rets){ + def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') + def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') + if(bdname == newName){ + d['N'] = DataUtil.getRound(6, r.lng) + d['O'] = DataUtil.getRound(6, r.lat) + d['P'] = r.estateType + if(r.region.contains(region)){ + d['Q'] = "区域相同" + }else{ + d['Q'] = r.region + } + d['R'] = r.name + break; + } + } + + }else{ + println "【${city}】 没有找到相关code" + } } - d["S"] = name - d['T'] = location }) -//def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + // //def code = codeMap.get("北京"); -rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); +//rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); //println(rets) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 10a5f2cb9..9e3d8167c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -27,6 +27,8 @@ class SuggestionDataSynch extends BaseBatch{ DBCollection administrative_division_100_CONN = MongoUtils.getCollectionByName2("fangjia", "administrative_division", MONGO100_URL) DBCollection SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + DBCollection MAPPOI_CONN = MongoUtils.getCollectionByName2("fangjia", "map_poi", MONGO100_URL) + public static def provinceMap = CommonDatautils.findAllCityProvince() def lastMonthDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); @@ -64,7 +66,7 @@ class SuggestionDataSynch extends BaseBatch{ for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","天津","西安"].contains(c)){ + if(["上海","北京","广州","深圳","成都","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ continue; } index++ @@ -263,9 +265,14 @@ class SuggestionDataSynch extends BaseBatch{ map.township = InsidePolygon.isInArea2(map.location.lon, map.location.lat, townMap) if(!map.township){ - def gaodeMap = getTownshipInfo(map.location.lon+","+map.location.lat) - if(gaodeMap && gaodeMap.township){ - map.township = gaodeMap.township + def obj = findTownshipByBD(dist.id) + if(obj){ + map.township = obj.township + }else{ + def gaodeMap = getTownshipInfo(map.location.lon+","+map.location.lat) + if(gaodeMap && gaodeMap.township){ + map.township = gaodeMap.township + } } } println map.township @@ -288,6 +295,15 @@ class SuggestionDataSynch extends BaseBatch{ } + def findTownshipByBD(id){ + def q = new BasicDBObject() + q.put("id", id) + def obj = MAPPOI_CONN.findOne(q) + return obj + + } + + def queryFullNameCity(){ def q = new BasicDBObject() def dbcursor = administrative_division_100_CONN.find(q)