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 e8316fda3..c22de3f29 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 @@ -31,15 +31,15 @@ class MinglujiData { def run(){ def prov = "浙江省" - def city = "湖州" + def city = "嘉兴" // exportDatas(city) -// matchDev(prov, city) -// matchCommunity(city) + matchDev(prov, city) + matchCommunity(city) // tempMatchDev(prov) - saveMljData() +// saveMljData() -// fiveLevelSplit(city) + fiveLevelSplit(city) } def exportDatas(city){ def datas = findMinglujiDatas(city) @@ -48,11 +48,11 @@ class MinglujiData { def matchDev(prov, city){ def devs = loadAllDevs(prov) - def i = 2; + def i = 1; while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\数据建设\\名录集\\mlj_${i}.xlsx" + fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" } File file=new File(fileName); if(file.exists()){ @@ -113,7 +113,7 @@ class MinglujiData { }) } i++ - println fileName +" 完成" + println fileName +" 完成(匹配开发区不使用接口)" } } @@ -152,11 +152,11 @@ class MinglujiData { } def matchCommunity(city){ - def i = 8; + def i = 1; while(i<20){ def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\名录集\\mlj_${i}.xlsx" + fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" } File file=new File(fileName); @@ -196,7 +196,7 @@ class MinglujiData { } } }, 0) - println fileName +" 远行完成" + println fileName +" 运行完成" } i++ } @@ -214,10 +214,10 @@ class MinglujiData { File file = new File(fileName); if (file.exists()) { ExcelUtils.multiThreadingModify(fileName, { d -> - def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['E']) + def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J']) if(jsonObject) { if (jsonObject.get("address") && jsonObject.get("address") != "null") { - d['J'] = jsonObject.get("address") + d['X'] = jsonObject.get("address") } } })