From 63e6e0ff9f9081a0ded56a209d0702bf296a4e98 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 22 Aug 2024 12:43:17 +0800 Subject: [PATCH] update --- .../script/gj/data_handle/MinglujiData.groovy | 113 +++++++++--------- 1 file changed, 59 insertions(+), 54 deletions(-) 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 3ced98380..538bc0a44 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 @@ -54,61 +54,66 @@ class MinglujiData { if (CommonDatautils.isWindow()) { fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" } - ExcelUtils.multiThreadingModify(fileName,{d-> - if(d['D']){ - def street = d['D'] - def splitStreet = "" - if(street){ - if(street.contains(d['C'])){ - def start = street.toString().lastIndexOf(d['C'])+d['C'].size() - def end = street.toString().size() - splitStreet = street.toString().substring(start, end) - }else{ - splitStreet = street - } - } - d['K'] = splitStreet - } - - if(d['I']){ - def splitCommunity = "" - if(d['C'] && d['I'].toString().contains(d['C'])){ - splitCommunity = d['I'].toString().substring(d['I'].toString().lastIndexOf(d['C'])+d['C'].toString().size(), d['I'].toString().size()) - }else{ - splitCommunity = d['I'] - } - d['L'] = splitCommunity - } - - - if(d['E'] && !d['N'] ){ - def obj = findDevByName(d['E']) - if(!obj){ - obj = findDevByAlias(d['E']) - if(!obj){ - obj = findDebBySimlar(devs, d['E'], d['B']) - if(!obj){ - obj = findDevByPark(d['A'], d['B'], d['E']) - if (!obj) { - }else{ - d['N'] = "园区" + File file=new File(fileName); + if(file.exists()){ + ExcelUtils.multiThreadingModify(fileName, { d -> + if (d['D']) { + def street = d['D'] + def splitStreet = "" + if (street) { + if (street.contains(d['C'])) { + def start = street.toString().lastIndexOf(d['C']) + d['C'].size() + def end = street.toString().size() + splitStreet = street.toString().substring(start, end) + } else { + splitStreet = street } - }else{ - d['N'] = "相似" } - }else{ - d['N'] = "别名" + d['K'] = splitStreet } - }else{ - d['N'] = "相同" - } - if(obj){ - d['M'] = obj.name - d['O'] = obj.city - d['P'] = obj.district - } - } - }) + + if (d['I']) { + def splitCommunity = "" + if (d['C'] && d['I'].toString().contains(d['C'])) { + splitCommunity = d['I'].toString().substring(d['I'].toString().lastIndexOf(d['C']) + d['C'].toString().size(), d['I'].toString().size()) + } else { + splitCommunity = d['I'] + } + d['L'] = splitCommunity + } + + + if (d['E'] && !d['N']) { + def obj = findDevByName(d['E']) + if (!obj) { + obj = findDevByAlias(d['E']) + if (!obj) { + obj = findDebBySimlar(devs, d['E'], d['B']) + if (!obj) { + obj = findDevByPark(d['A'], d['B'], d['E']) + if (!obj) { + } else { + d['N'] = "园区" + } + } else { + d['N'] = "相似" + } + } else { + d['N'] = "别名" + } + } else { + d['N'] = "相同" + } + if (obj) { + d['M'] = obj.name + d['O'] = obj.city + d['P'] = obj.district + } + } + }) + } + i++ + println fileName +" 完成" } } @@ -147,7 +152,7 @@ class MinglujiData { } def matchCommunity(city){ - def i = 0; + def i = 1; while(i<20){ def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if(CommonDatautils.isWindow()){ @@ -193,7 +198,7 @@ class MinglujiData { }, 0) println fileName +" 远行完成" } - + i++ } }