Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj

# Conflicts:
#	projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/TownStandardBatch.groovy
This commit is contained in:
2024-11-07 10:44:47 +08:00
3 changed files with 9 additions and 5 deletions
@@ -34,8 +34,8 @@ class DevUpdateTestBatch {
static main(args) { static main(args) {
def task = new DevUpdateTestBatch() def task = new DevUpdateTestBatch()
def path = "D:\\数据\\数据建设\\开发区\\开发区-园区.xlsx"//开发区-园区.xlsx def path = "D:\\数据\\数据建设\\开发区\\开发区-园区.xlsx"//开发区-园区.xlsx
task.addDev(path) // task.addDev(path)
// task.addDevAddress(path) task.addDevAddress(path)
// //
// task.updateHasGov("新疆维吾尔自治区","喀什地区","麦盖提县", "麦盖提镇", "是") // task.updateHasGov("新疆维吾尔自治区","喀什地区","麦盖提县", "麦盖提镇", "是")
@@ -122,6 +122,8 @@ class DevUpdateTestBatch {
q.put("address", d['C']) q.put("address", d['C'])
}else if(d['B'] == "园区"){ }else if(d['B'] == "园区"){
q.put("park", d['C']) q.put("park", d['C'])
}else if(d['B'] == "Poi"){
q.put("poi", d['C'])
} }
def mappingObj = DEV_MAPPING_100_CONN.findOne(q) def mappingObj = DEV_MAPPING_100_CONN.findOne(q)
if(!mappingObj){ if(!mappingObj){
@@ -137,6 +139,8 @@ class DevUpdateTestBatch {
o.put("address", d['C']) o.put("address", d['C'])
}else if(d['B'] == "园区"){ }else if(d['B'] == "园区"){
o.put("park", d['C']) o.put("park", d['C'])
}else if(d['B'] == "Poi"){
o.put("poi", d['C'])
} }
def date = new Date() def date = new Date()
o.put("c_date", date) o.put("c_date", date)
@@ -164,7 +168,7 @@ class DevUpdateTestBatch {
println d['A'] +" 不存在" println d['A'] +" 不存在"
} }
} }
},1) },2)
} }
@@ -44,7 +44,7 @@ class ThirdPriceMappingBatch extends BaseBatch{
@Override @Override
public void process(Object args) { public void process(Object args) {
// //将新增数据同步过来 // //将新增数据同步过来
addNemCommunity() // addNemCommunity()
// //接口进行匹配 // //接口进行匹配
match() match()
@@ -41,7 +41,7 @@ class TownStandardBatch extends BaseBatch{
} }
def townStandardByCat(def cat){ def townStandardByCat(def cat){
//"三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德", //"三明","龙岩","南平","漳州","福州","厦门","泉州","莆田","宁德",
def citys = CommonDatautils.findAllCity() def citys = ["重庆","龙岩","南平","漳州","福州","厦门","泉州","莆田","三明","宁德"]//CommonDatautils.findAllCity()
for(def city : citys){ for(def city : citys){
def data = fullCityMap.get(city) def data = fullCityMap.get(city)