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 ce20d1f8e..2624d025c 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 @@ -33,8 +33,8 @@ class MinglujiData { def prov = "浙江省" def city = "嘉兴" // exportDatas(city) -// matchDev(prov, city) -// matchCommunity(city) + matchDev(prov, city) + matchCommunity(city) // tempMatchDev(prov) // saveMljData() @@ -204,20 +204,22 @@ class MinglujiData { def fiveLevelSplit(city){ - def i = 2; + def i = 1; while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" + fileName = "D:\\数据\\数据建设\\名录集\\mlj_${i}.xlsx" } File file = new File(fileName); if (file.exists()) { ExcelUtils.multiThreadingModify(fileName, { d -> - def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J']) - if(jsonObject) { - if (jsonObject.get("address") && jsonObject.get("address") != "null") { - d['X'] = jsonObject.get("address") + if(d['J'] && !d['X']){ + def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J']) + if(jsonObject) { + if (jsonObject.get("address") && jsonObject.get("address") != "null") { + d['X'] = jsonObject.get("address") + } } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index 6ed160a56..d2715e430 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -335,7 +335,7 @@ class FangjiaClientUtils { try { address = address.replace("{","") // def url = "http://192.168.0.19:31080/FangJiaNlpService/formatFivelevel?address="+URLEncoder.encode(address,"UTF-8") - def url = "http://192.168.0.100:32080/FangJiaNlpService/formatFivelevel?address="+URLEncoder.encode(address,"UTF-8") + def url = "http://192.168.0.93:8080/FangJiaNlpService/formatFivelevel?address="+URLEncoder.encode(address,"UTF-8") if(city){ url = url +"&city="+URLEncoder.encode(city,"UTF-8") } @@ -352,9 +352,10 @@ class FangjiaClientUtils { public static def formatNinelevel(city, address){ def jsonObj = null def content = null + def url = null try { address = address.replace("{","") - def url = "http://192.168.0.93:8080/FangJiaNlpService/formatNinelevel?address="+URLEncoder.encode(address,"UTF-8")+"&complete=false&useMap=false&addressAssessment=true&fields=dev_confi" + url = "http://192.168.0.93:8080/FangJiaNlpService/formatNinelevel?address="+URLEncoder.encode(address,"UTF-8")+"&complete=false&useMap=false&addressAssessment=true&fields=dev_confi" if(city){ url = url +"&city="+URLEncoder.encode(city,"UTF-8") }