From 2cd3978887c0c32482c5933985ac8d4620e6b439 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 16 Oct 2024 13:50:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/data_handle/GXDdistrictMatch.groovy | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy index 61ed0ea7b..2c44aa6e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy @@ -40,11 +40,15 @@ class GXDdistrictMatch { def addOldMatch(){ //老匹配 - def fileName = "D:\\数据\\建行\\房产估值\\20240716-20240815 _业务反馈价格.xlsx"//11城重新匹配.xlsx + def fileName = "/home/goojia/gj/map.xlsx" + if (CommonDatautils.isWindow()) { + fileName = "C:\\Users\\gaojuan\\Downloads\\百度有围栏数据1.xlsx"//11城重新匹配.xlsx + } + ExcelUtils.multiThreadingModify(fileName, { d -> println d['C'] - if(!d['AJ'] && d['I']){ - def jsonObject = OpenApiClient.addressMatch(d['C'], d['D'], "district", false,null, d['D']) + if(!d['AJ'] && d['C']){ + def jsonObject = OpenApiClient.addressMatch(d['A'], d['D'], "district", false,d['B'], d['C']) if (jsonObject != null && !jsonObject.containsKey("result")) { d['AJ'] = jsonObject.get("id") d['AK'] = jsonObject.get("city") @@ -60,7 +64,7 @@ class GXDdistrictMatch { } } } - }); + }, 1); } From 400b6a00d4c81d4e2a3bbd83bbf1a80fc53c5f11 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 16 Oct 2024 14:11:15 +0800 Subject: [PATCH 2/2] update --- .../com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy index 2c44aa6e5..35c1fa9db 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/GXDdistrictMatch.groovy @@ -64,7 +64,7 @@ class GXDdistrictMatch { } } } - }, 1); + }); }