Merge branch 'script_gj' into 'master'

解析开发区加街道

See merge request !854
This commit is contained in:
2024-06-04 10:06:20 +08:00
@@ -3,7 +3,9 @@ package com.fangjia.script.gj.data_handle
import com.fangjia.core.RegionData
import com.fangjia.core.util.GeoUtils
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.common.DataHandleUtils
import com.fangjia.script.gj.district.FangjiaClientUtils
import com.fangjia.script.gj.district.SeaweedDataMatchProcess
import com.fangjia.script.linxsh.util.AddressUtil
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.MongoUtils
@@ -49,6 +51,7 @@ class DevProcess {
// task.addNewDev2()
// task.addAlias()
// task.addDevShape()//添加开发区围栏
}
@@ -171,7 +174,7 @@ class DevProcess {
while(i<1){
def fileName = "/home/goojia/gj/hebei-${i}.xlsx"
if(CommonDatautils.isWindow()){
fileName = "D:\\数据\\数据建设\\浙江-湖州.xlsx"
fileName = "D:\\数据\\数据建设\\开发区\\江苏-无锡.xlsx"
}
ExcelUtils.multiThreadingModify(fileName,{d->
/*if(d['C'] && !d['V']){
@@ -197,32 +200,48 @@ class DevProcess {
}
}
}*/
if(d['C'] && !d['J']){
if(d['C'] && !d['G']){
def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['C'])
if(jsonObject){
def street = jsonObject.get("street")
def streetNumber = jsonObject.get("streetNumber")
if(jsonObject.get("province") && jsonObject.get("province")!="null"){
d['J'] = jsonObject.get("province")
d['G'] = jsonObject.get("province")
}
if(jsonObject.get("city") && jsonObject.get("city")!="null"){
d['K'] = jsonObject.get("city")
d['H'] = jsonObject.get("city")
}
if(jsonObject.get("district") && jsonObject.get("district")!="null"){
d['L'] = jsonObject.get("district")
d['I'] = jsonObject.get("district")
}
if(jsonObject.get("township") && jsonObject.get("township")!="null"){
d['J'] = jsonObject.get("township")
}
if(jsonObject && street && streetNumber && street!="null"){
d['M'] = jsonObject.get("street")
d['K'] = jsonObject.get("street")
if(streetNumber!='null'){
d['N'] = jsonObject.get("streetNumber")
d['L'] = jsonObject.get("streetNumber")
def road = jsonObject.get("street")+jsonObject.get("streetNumber")
if(!d['C'].contains(road)){
d['N'] = "原地址不含路"
}
if(!d['N']){
def flag = road.matches('^[\u4e00-\u9fa5]+?(路|大道|巷|胡同|街).+[弄号]$')
if(!flag){
d['N'] = "路非法"
}
}
}
}
if(jsonObject.get("dev") && jsonObject.get("dev")!="null"){
d['O'] = jsonObject.get("dev")
d['M'] = jsonObject.get("dev")
}
}
@@ -665,4 +684,18 @@ class DevProcess {
}
})
}
def addDevShape(){
ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\开发区围栏.xlsx",{d->
if(d['W']){
def s = d['S']
JSONObject jsonObject = JSONObject.fromObject(s);
Map<String, Object> map = DataHandleUtils.JsonToMap(jsonObject);
def udata = new BasicDBObject()
udata.put("shape", map)
development_zone_CONN.update(new BasicDBObject("_id",new ObjectId(d['L'])), new BasicDBObject('$set',udata))
}
})
}
}