Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+9
-4
@@ -228,12 +228,17 @@ class AutoAddOfficeBatch extends BaseBatch {
|
||||
def citys = CommonDatautils.findAllCity()
|
||||
def allrets = []
|
||||
allrets << [ "城市", "区域", "名称", "别名","计算方式","地址","名称相似度","地址相似度","总相似度"]
|
||||
def index = 0
|
||||
for (def c : citys) {
|
||||
index++
|
||||
if(index>4){
|
||||
continue
|
||||
}
|
||||
def districts = CommonDatautils.findAllDistricts(c, "district", ["city", "region", "name", "address", "alias"])
|
||||
def rets = checkRepeatDistrictBatch(c, districts)
|
||||
println c + " " + districts.size()
|
||||
allrets.addAll(rets)
|
||||
println c +" 支行完成 "+rets.size()
|
||||
println "${index}"+ c +" 运A行完成 "+rets.size()
|
||||
}
|
||||
ExcelUtils.write("/home/goojia/gj/重复可疑小区1.xlsx", allrets, "数据")
|
||||
}
|
||||
@@ -361,7 +366,7 @@ class AutoAddOfficeBatch extends BaseBatch {
|
||||
}else{
|
||||
str = o2.name.replace(o1.name, "")
|
||||
}
|
||||
if (nameScore > 0.6 && ["一期","二期","三期","四期","五期","六期","七期","八期","九期","十期","东区","西区","南区","北区","A区","B区","C区","D区"].contains(str)) {
|
||||
if (nameScore > 0.6 && !["一期","二期","三期","四期","五期","六期","七期","八期","九期","十期","东区","西区","南区","北区","A区","B区","C区","D区"].contains(str)) {
|
||||
o2.nameScore = nameScore
|
||||
o2.addrScore = addrScore
|
||||
o2.score = nameScore
|
||||
@@ -371,7 +376,7 @@ class AutoAddOfficeBatch extends BaseBatch {
|
||||
while(maxObj){
|
||||
maxObj.nameScore = CosineSimilarAlgorithm.levenshteinSimilarity(maxObj.name, o1.name);
|
||||
if(o1.address && maxObj.address){
|
||||
maxObj.addrScore = CosineSimilarAlgorithm.levenshteinSimilarity(o1.address, o2.address);
|
||||
maxObj.addrScore = CosineSimilarAlgorithm.levenshteinSimilarity(o1.address, maxObj.address);
|
||||
}
|
||||
maxObj.score = maxObj.nameScore
|
||||
rets << maxObj
|
||||
@@ -412,7 +417,7 @@ class AutoAddOfficeBatch extends BaseBatch {
|
||||
}else{
|
||||
str = o2.name.replace(o1.name, "")
|
||||
}
|
||||
if (nameScore > 0.6 && nameScore>maxScore && ["一期","二期","三期","四期","五期","六期","七期","八期","九期","十期","东区","西区","南区","北区","A区","B区","C区","D区"].contains(str)) {
|
||||
if (nameScore > 0.6 && nameScore>maxScore && !["一期","二期","三期","四期","五期","六期","七期","八期","九期","十期","东区","西区","南区","北区","A区","B区","C区","D区"].contains(str)) {
|
||||
maxObj = o2
|
||||
o2.nameScore = nameScore
|
||||
o2.addrScore = addrScore
|
||||
|
||||
+1
-1
@@ -310,7 +310,7 @@ class SMSOutgoingListener extends BaseBatch {
|
||||
if(StringUtils.isNotBlank(checkCode)){
|
||||
JSONObject con = new JSONObject()
|
||||
con.put("code", checkCode);
|
||||
return AliyunSmsClient.sendSms(mobile, "SMS_482955117", con.toString())
|
||||
return AliyunSmsClient.sendSms(mobile, "SMS_483345375", con.toString())
|
||||
}
|
||||
}
|
||||
int resCode = SingletonClient.getClient().sendSMS([mobile] as String[],content, 5)
|
||||
|
||||
Reference in New Issue
Block a user