Merge branch 'script_gj' into 'master'

update

See merge request !920
This commit is contained in:
2024-08-22 12:44:27 +08:00
@@ -54,61 +54,66 @@ class MinglujiData {
if (CommonDatautils.isWindow()) { if (CommonDatautils.isWindow()) {
fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx" fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx"
} }
ExcelUtils.multiThreadingModify(fileName,{d-> File file=new File(fileName);
if(d['D']){ if(file.exists()){
def street = d['D'] ExcelUtils.multiThreadingModify(fileName, { d ->
def splitStreet = "" if (d['D']) {
if(street){ def street = d['D']
if(street.contains(d['C'])){ def splitStreet = ""
def start = street.toString().lastIndexOf(d['C'])+d['C'].size() if (street) {
def end = street.toString().size() if (street.contains(d['C'])) {
splitStreet = street.toString().substring(start, end) def start = street.toString().lastIndexOf(d['C']) + d['C'].size()
}else{ def end = street.toString().size()
splitStreet = street 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'] = "园区"
} }
}else{
d['N'] = "相似"
} }
}else{ d['K'] = splitStreet
d['N'] = "别名"
} }
}else{
d['N'] = "相同" if (d['I']) {
} def splitCommunity = ""
if(obj){ if (d['C'] && d['I'].toString().contains(d['C'])) {
d['M'] = obj.name splitCommunity = d['I'].toString().substring(d['I'].toString().lastIndexOf(d['C']) + d['C'].toString().size(), d['I'].toString().size())
d['O'] = obj.city } else {
d['P'] = obj.district 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 matchCommunity(city){
def i = 0; def i = 1;
while(i<20){ while(i<20){
def fileName = "/home/goojia/gj/mlj_${i}.xlsx" def fileName = "/home/goojia/gj/mlj_${i}.xlsx"
if(CommonDatautils.isWindow()){ if(CommonDatautils.isWindow()){
@@ -193,7 +198,7 @@ class MinglujiData {
}, 0) }, 0)
println fileName +" 远行完成" println fileName +" 远行完成"
} }
i++
} }
} }