From 6a56aa1825163798bcbed2c6093efcf1a14cb03a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 29 Jan 2024 15:39:40 +0800 Subject: [PATCH] update --- .../DealAndThirdPriceDataProcess.groovy | 5 +- .../ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../fangjia/script/ccbevaluation/Test.groovy | 14 +- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 2 +- .../script/ccbevaluation/TradeStatLog.groovy | 10 +- .../pgsql/ExportPgsqlBaseEvaluation.groovy | 2 +- .../com/fangjia/script/gj/OpenApiUtils.groovy | 41 ++++- .../fangjia/script/gj/YouDaDataParser.groovy | 6 +- .../gj/village/communityLocation.groovy | 156 +++++++++++++----- .../script/gj/village/govLocation.groovy | 101 ++++++++---- .../script/gj/village/saveCommunity.groovy | 47 ++++++ .../gj/xiamen/SuggestionDataSynch.groovy | 27 ++- .../com/fangjia/script/util/ExcelUtils.groovy | 2 +- 13 files changed, 310 insertions(+), 105 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.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 d408f306a..8bc6aff7c 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 @@ -29,7 +29,7 @@ class DealPriceDataProcess { // task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据 // task.addLianJiaPrice(); task.deleteThirdPartyData()//删除第三方 - task.delDealByPe()//删除成交 +// task.delDealByPe()//删除成交 // task.delDealData() // task.exportThirdParty() @@ -37,8 +37,7 @@ class DealPriceDataProcess { } def delDealByPe(){ - def yearMonth = 202312 - def thirdMonth = 202112 + def yearMonth = 202401 def rets = findAllDealByPe(yearMonth, 18) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index bdbbf0757..3c2ebd153 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2023-12-27", "2024-01-10") + def prices = CcbCommonUtils.findPersonPrice(city, "2024-01-10", "2024-01-28") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index fee89528d..3979f56c4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -1288,7 +1288,7 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ -def fileName = "D:\\数据\\建行\\房产估值\\指导价\\20231222--修正人工指导价.xlsx" +def fileName = "D:\\数据\\建行\\房产估值\\指导价\\20240127.xlsx" ExcelUtils.multiThreadingModify(fileName, {d-> if(d['A']){ @@ -1303,13 +1303,13 @@ ExcelUtils.multiThreadingModify(fileName, {d-> if(!d['I']){ def dist = CommonDatautils.findDistrictById(d['C']) if(dist){ - d['I'] = dist.region + d['F'] = dist.region // d['H'] = dist.name - d['J'] = dist.status - if(d['A']=="天门" || d['A']=="迪庆"){ - def val = d['E'].toString().toDouble().toInteger() + RandomUtil.random(-200,200) - d['K'] = val.toInteger() - } + d['G'] = dist.status +// if(d['A']=="天门" || d['A']=="迪庆"){ +// def val = d['E'].toString().toDouble().toInteger() + RandomUtil.random(-200,200) +// d['K'] = val.toInteger() +// } } } } 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 492fb152d..8483a84a0 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 @@ -54,7 +54,7 @@ class ThirdPartyPriceBatch extends BaseBatch { // ps.addBatch(id) // } // } - +// def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] def index = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy index 083c40764..7ab2fc7e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy @@ -93,13 +93,13 @@ class TradeStatLog { def run(){ def citys = CcbCommonUtils.citys_all; def rets = [] - rets << ["城市","23年9月总量","23年10月总量","23年11月总量","占比","贝壳","链家", "我爱我家","幸福里APP","中原"] + rets << ["城市","23年10月总量","23年11月总量","23年12月总量","占比","贝壳","链家", "我爱我家","幸福里APP","中原"] def sources = ["贝壳找房","链家在线","我爱我家","房天下","中原地产"] //def startDate = "2021-05-01" - def startDate = "2023-09-01" - def date = "2023-10-01" - def endDate = "2023-11-01" - def newDate = "2023-12-01" + def startDate = "2023-10-01" + def date = "2023-11-01" + def endDate = "2023-12-01" + def newDate = "2024-01-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy index a7381d0bd..87dc977a5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -17,7 +17,7 @@ class ExportPgsqlBaseEvaluation { def database = "base" def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; - def linux_prefix = "/home/goojia/ccb_data/evaluation/" + def linux_prefix = "/home/goojia/ccb_data/evaluation/" def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\" static main(args) { 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 f6f47f7c6..cbd2845ec 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 @@ -374,15 +374,18 @@ class OpenApiUtils { } - static def searchBaiDuMap(String address, String region, int cityCode) { + static def searchBaiDuMap(String region, String township, String keyword,int cityCode) { def rets = [] + keyword = keyword.replace("居民委员会","").replace("居委会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村") + def address = keyword try { Thread.sleep(500) long t = System.currentTimeMillis() // String url = "http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1" + // "&qt=con&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&sug=0&l=13" + // "&sug_forward=&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}" - String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; +// String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; + String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; def content = new HttpRequest().get(url, null, "utf-8") JSONObject json = JSONObject.fromObject(content) @@ -390,22 +393,46 @@ class OpenApiUtils { for (def loc : json.content) { String name = formatName(address) if(loc.uid) { - JSONObject uidInfo = BaiDuApiUtils.getDetailByUid(loc.uid) + JSONObject uidInfo = null;//BaiDuApiUtils.getDetailByUid(loc.uid) if(uidInfo != null) { rets = createData(rets, uidInfo, loc, region, name, address) }else{ - def baiduRegion = loc.area_name.replace(loc.city_name,"") def baiduCity = loc.city_name + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } baiduCity = RegionData.formatCity(baiduCity) - def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); - def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(!baiduCity){ + baiduCity = loc.history_address + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } + baiduCity = RegionData.formatCity(baiduCity) + } + if(!baiduCity){ + baiduCity = loc.area_name + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } + baiduCity = RegionData.formatCity(baiduCity) + } + + def baiduRegion = loc.area_name.replace(baiduCity,"") + + keyword = keyword.replace("社区","") + def bdName = loc.name.replace("居民委员会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村").replace("社区","") + + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(bdName, keyword); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, keyword); if(score1 || score2){ def bean = [:] bean.name = loc.name bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion - bean.township = loc.admin_info.town_name + if(loc.admin_info){ + bean.township = loc.admin_info.town_name + } def locArrs = BaiduCoordinateConverter.bdMercator2Latlng(loc.diPointX/100.0, loc.diPointY/100.0) if(locArrs){ def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0], locArrs[1]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index c4574b523..621b548e7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -48,13 +48,13 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2023-11-01" + static def statDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1),"yyyy-MM-dd") static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//友达一手房存入mongo -// task.esfParser("D:\\数据\\友达\\2023年12月\\查询1.DBF");//友达二手房存入mongo + task.esfParser("D:\\数据\\友达\\2024年1月\\查询1.DBF");//友达二手房存入mongo // task.newhouseToSaveEs();//新房保存到es - task.esfhouseToSaveEs();//二手房保存到es +// task.esfhouseToSaveEs();//二手房保存到es // task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间 } 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 d8fdcf40c..766dabccf 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 @@ -3,17 +3,23 @@ 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.ElasticUtils import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils + +import java.sql.ResultSet + +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","胡杨河市":"3370","新星市":"3384","昆玉市":"659009","三沙市":"3336","白沙黎族自治县":"2359","乐东黎族自治县":"2032","陵水黎族自治县":"1643","琼中黎族苗族自治县":"2031","毕节市":"206","济源市":"1277","昌江黎族自治县":"1642","吐鲁番市":"89","林芝市":"98"] +def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉市":"659009","伊犁":"654000"] -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:\\数据\\涉农\\居委(包含不准-5万).xlsx" +filePath = "D:\\数据\\涉农\\18万最终-入库.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> - if(!d['N']){ + if(!d['N'] && d['J']){ def city = d['D'] def region = d['F'] def name = d['J'] @@ -23,45 +29,56 @@ ExcelUtils.multiThreadingModify(filePath, {d-> code = codeMap.get(RegionData.formatCity(city)); } if(code){ - def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); + def rets = OpenApiUtils.searchBaiDuMap(region,township,city+name, code.toInteger()); rets = sortResult(rets) 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('居委会','') - def stopFlag = false - if(bdname == newName){ - stopFlag = true - }else if(bdname.endsWith("村")){ - if(bdname.equals(newName+"村")){ - stopFlag = true - }else{ - if(bdname.equals(township+newName+"村")){ - stopFlag = true - } - } - }else if(bdname.contains(newName)){ - if(r.township && bdname.contains(r.township)){ - bdname = bdname.substring(bdname.indexOf(r.township)+r.township.length()) - if(bdname && bdname == newName){ - stopFlag = true - } - } - } - if(stopFlag){ + if(rets){ + def r = rets[0] + if(r.city && city.contains(r.city)){ 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['Q'] = r.region d['R'] = r.name - break; + d['S'] = r.score } } +// 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('居委会','') +// def stopFlag = false +// if(bdname == newName){ +// stopFlag = true +// }else if(bdname.endsWith("村")){ +// if(bdname.equals(newName+"村")){ +// stopFlag = true +// }else{ +// if(bdname.equals(township+newName+"村")){ +// stopFlag = true +// } +// } +// }else if(bdname.contains(newName)){ +// if(r.township && bdname.contains(r.township)){ +// bdname = bdname.substring(bdname.indexOf(r.township)+r.township.length()) +// if(bdname && bdname == newName){ +// stopFlag = true +// } +// } +// } +// if(stopFlag){ +// 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" @@ -69,19 +86,80 @@ ExcelUtils.multiThreadingModify(filePath, {d-> } }) +ExcelUtils.multiThreadingModify(filePath, {d-> + if(d['J'] && d['R']){ + def newName1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") + def newName2 = d['R'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") + if(newName1.contains(newName2) || newName2.contains(newName1)){ + d['U'] = "包含" + }else{ + def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName1, " ") + def py2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName2, " ") + if(py1.contains(py2) || py2.contains(py1)){ + d['U'] = "拼音相似" + } + } + } +}) + +//ExcelUtils.multiThreadingModify(filePath, {d-> +// if(d['J'] ) { +// def pois = findPois(d['D'], d['F'], d['J']) +// if(pois){ +// def name1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// for(def poi : pois){ +// def name2 = poi.name.replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// if(name1.contains(name2) || name2.contains(name1)){ +// //经度 纬度 类型 百度区域 百度名称 +// d['N'] = poi.lng +// d['O'] = poi.lat +// d['P'] = poi.type +// d['Q'] = poi.region +// d['R'] = poi.name +// break; +// } +// } +// } +// } +// +//}) + +static def findPois(def city, def region, def name){ + final StringBuffer sqlBuffer = new StringBuffer() + def sql = "select * from amap_poi where cityname='${city}' and adname='${region}' and MATCH(name, '${name}') and typecode in ('130000','130100','130101','130102','130103','130104','130105','130106')" + def rets = [] + ElasticUtils.executeSqlQuery(sql,{ data-> + def m = [:] + m.city = data.cityname + m.region = data.adname + m.name = data.name + m.address = data.address + m.type = data.type + m.code = data.typecode + + def location = data.location + m.lng = location.lon + m.lat = location.lat + rets << m + }) + + return rets; +} + + def sortResult(rets){ rets.sort{a,b-> def a1 = a.estateType def b1 = b.estateType def a1_score = a.score - if(a1 && a1.contains("政府机构")){ - a1_score = a1_score +1 - } +// if(a1 && a1.contains("政府机构")){ +// a1_score = a1_score +1 +// } def b1_score = b.score - if(b1 && b1.contains("政府机构")){ - b1_score = b1_score +1 - } +// if(b1 && b1.contains("政府机构")){ +// b1_score = b1_score +1 +// } return b1_score.compareTo(a1_score) } return rets diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy index 99352aedd..13dc8a040 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.gj.village +import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.EsSearchUtils import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.ExcelUtils @@ -13,43 +14,77 @@ DBCollection TOWN_POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) -def filePath = "D:\\数据\\涉农\\县.xlsx" -ExcelUtils.multiThreadingModify(filePath, { row -> -// if(!row['I']){ -// def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") -// if(rets){ -// def obj = findOneByName(rets, row['C']+"人民政府") -// if(obj){ -// row['I'] = obj.lng -// row['J'] = obj.lat -// println row['C'] + " "+obj -// } -// } -// } -// if(row['D'] && !row['F']){ -// def townMap = findTownRange(row['B'], TOWN_POLYLINECOLL) -// def map = ["lon":row['D'], "lat":row['E']] -// def township = InsidePolygon.isInArea2(map.lon, map.lat, townMap) -// row['F'] = township -// } +//def s = getTownshipInfo("118.702988,39.740979") +def filePath = "D:\\数据\\涉农\\县政府(最终).xlsx" +//ExcelUtils.multiThreadingModify(filePath, { row -> +//// if(!row['I']){ +//// def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") +//// if(rets){ +//// def obj = findOneByName(rets, row['C']+"人民政府") +//// if(obj){ +//// row['I'] = obj.lng +//// row['J'] = obj.lat +//// println row['C'] + " "+obj +//// } +//// } +//// } +// +//// if(row['D'] && !row['F']){ +//// def townMap = findTownRange(row['B'], TOWN_POLYLINECOLL) +//// def map = ["lon":row['D'], "lat":row['E']] +//// def township = InsidePolygon.isInArea2(map.lon, map.lat, townMap) +//// row['F'] = township +//// } +// +//// if(row['F'] && !row['J']){ +//// def q = new BasicDBObject() +//// q.put("city_name", row['B']) +//// q.put("area_name", row['C']) +//// def streetName = row['F'] +//// q.put("street_name", streetName) +//// def count = COMMUNITY_CONN.count(q); +//// row['J'] = count +////// row['H'] = streetName +//// } +//// if(!row['H']){ +//// def gaodeMap = getTownshipInfo(row['D']+","+row['E']) +//// if(gaodeMap && gaodeMap.township){ +//// row['H'] = gaodeMap.township +//// } +//// } +// +//// if(row['J'] && row['J'].toString().toDouble()>0){ +//// def up_query = new BasicDBObject() +//// up_query.put("city_name", row['B']) +//// up_query.put("area_name", row['C']) +//// up_query.put("street_name", row['F']) +//// def udata = new BasicDBObject() +//// udata.put("has_gov", "是") +//// COMMUNITY_CONN.update(up_query, new BasicDBObject('$set', udata), false, true) +//// } +// +// +//}) + + +def objs = COMMUNITY_CONN.find(new BasicDBObject()) +for(def d : objs){ + if(d.name){ + def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(d.name, " ") + def udata = new BasicDBObject() + udata.put("name_pinyin", py1) + if(d.location){ + def lon = DataHandleUtils.getDoubleRound(6, d.location.lon) + def lat = DataHandleUtils.getDoubleRound(6, d.location.lat) + udata.put("location", ["lat":lat, "lon":lon]) + } - if(row['F'] && !row['G']){ def q = new BasicDBObject() - q.put("city_name", row['B']) - q.put("area_name", row['C']) - def streetName = row['F'] - q.put("street_name", streetName) - def count = COMMUNITY_CONN.count(q); - row['G'] = count -// row['H'] = streetName + q.put("_id", d._id) + COMMUNITY_CONN.update(q, new BasicDBObject('$set', udata), false, true) } -// def gaodeMap = getTownshipInfo(row['D']+","+row['E']) -// if(gaodeMap && gaodeMap.township){ -// row['H'] = gaodeMap.township -// } - -}) +} def getTownshipInfo(def glocation){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy new file mode 100644 index 000000000..8918f18f3 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy @@ -0,0 +1,47 @@ +package com.fangjia.script.gj.village + +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 org.bson.types.ObjectId + +def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; +DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community_new_2023", MONGO100_URL) + +filePath = "D:\\数据\\涉农\\18万最终-id.xlsx" +def index = 0 +ExcelUtils.multiThreadingModify(filePath, { d-> + + if(d['A']){ + def q = new BasicDBObject("_id", d['A']) + def dbo = COMMUNITY_CONN.findOne(q) + if(dbo){ + index++ + println index + COMMUNITY_CONN.remove(q) + }else{ +// def udata = new BasicDBObject() +// udata.put("_id" , d['A']) +// udata.put("province" , d['A']) +// udata.put("province_code" , d['A']) +// udata.put("city_code" , d['A']) +// udata.put("area_name" , d['A']) +// udata.put("area_code" , d['A']) +// udata.put("street_name" , d['A']) +// udata.put("street_code" , d['A']) +// udata.put("name" , d['A']) +// udata.put("code" , d['A']) +// udata.put("type_code" , d['A']) +// udata.put("type_name" , d['A']) +// udata.put("location_type" , d['A']) +// udata.put("geohash" , d['A']) +// udata.put("location" , d['A']) +// udata.put("new_poi_name" , d['A']) +// udata.put("new_area_name" , d['A']) +// udata.put("city_name" , d['A']) +// COMMUNITY_CONN.save(udata); + } + } +}) \ 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 25930543d..86eac3172 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 @@ -4,6 +4,7 @@ import com.fangjia.core.RegionData import com.fangjia.script.BaseBatch import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.lixue.DB.City import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils @@ -44,15 +45,29 @@ class SuggestionDataSynch extends BaseBatch{ static main(args) { runBatch(new SuggestionDataSynch(), args); + } @Override public void process(Object args) { run() // updateCode() +// getExitsCity() } + def getExitsCity(){ + SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + def cities = SUGGESTION_CONN.distinct("city") + def simpleCities = [] + for (def c :cities) { + def city = RegionData.formatCity(c) + simpleCities.add(city) + } +// print(simpleCities) + return simpleCities + } + @@ -63,10 +78,14 @@ class SuggestionDataSynch extends BaseBatch{ def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() + def existCities = getExitsCity() for (def c : citys) { + def allRets = [] - if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ + +// if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ + if(existCities.contains(c)){ continue; } index++ @@ -103,9 +122,9 @@ class SuggestionDataSynch extends BaseBatch{ SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) count = SUGGESTION_CONN.count(q) } - if(count>0){ - SUGGESTION_CONN.remove(q) - } +// if(count>0){ +// SUGGESTION_CONN.remove(q) +// } def rets = [] for(def i=0;i