From 4472622cf28e02fac07c0987ac9b3df8271f75b5 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Tue, 27 Aug 2024 14:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E5=8F=AF=E4=BF=A1?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/data_handle/DevProcess.groovy | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy index 861999ae8..87dc209ef 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy @@ -205,29 +205,33 @@ class DevProcess { while(i<20){ def fileName = "/home/goojia/gj/qzd-${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\开发区\\福建省.xlsx" + fileName = "D:\\数据\\数据建设\\名录集\\qzd-${i}.xlsx" } File file=new File(fileName); if(file.exists()){ ExcelUtils.multiThreadingModify(fileName,{d-> - if(d['E'] && !d['G']){ - def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E']) + if(d['E'] && !d['R']){ + def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['C']) if(jsonObject1) { if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") { def devName = jsonObject1.get("dev") def obj = findDev(d['B'], devName) d['F'] = devName + if(jsonObject1.containsKey("detail")){ + d['U'] = jsonObject1.detail.dev_confi + } if (obj) { d['Q'] = obj._id.toString() d['R'] = obj.name + } } } } - if(d['C'] && !d['S']) { - def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['C']) + if(d['E'] && !d['S']) { + def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E']) def street = jsonObject.get("street") def streetNumber = jsonObject.get("streetNumber") if (jsonObject.get("province") && jsonObject.get("province") != "null") { @@ -282,11 +286,16 @@ class DevProcess { d['S'] = obj._id.toString() d['T'] = obj.name } + if(jsonObject.containsKey("detail")){ + d['V'] = jsonObject.detail.dev_confi + } } } },0) - i++ + } + i++ + println fileName+" 完成" } }