From a8270b4f6825a110b33309fa3eb3a2d3f524b157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Mon, 28 Jun 2021 16:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E5=87=86=E5=8C=96?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/ExportStandardResult.groovy | 31 +++++++++--- .../temp/shenjian/address/StandardTest.groovy | 50 ++++++++++++++++--- 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/ExportStandardResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/ExportStandardResult.groovy index bc2365983..7b400357a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/ExportStandardResult.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/ExportStandardResult.groovy @@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import com.mongodb.DBObject import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch @@ -23,9 +24,10 @@ class ExportStandardResult { static void main(String[] args) { List> data = new ArrayList<>() def map = new ConcurrentHashMap() - CountDownLatch latch = new CountDownLatch(conn136.count().intValue()) - conn136.find(new BasicDBObject(), new BasicDBObject("address", 1).append("city", 1) - .append("format_address", 1).append("order", 1)).batchSize(10000).each { + // 查询条件 + DBObject query = new BasicDBObject('status', 0).append('flag', '浙商疑问地址复测') + CountDownLatch latch = new CountDownLatch(conn136.count(query).intValue()) + conn136.find(query).batchSize(10000).each { objT -> final obj = objT executorService.submit(new Runnable() { @@ -33,9 +35,22 @@ class ExportStandardResult { void run() { try { def ret = [] - ret[0] = obj.city - ret[1] = obj.address - ret[2] = obj.format_address + ret << obj.format_province + ret << obj.format_city + ret << obj.format_region + ret << obj.format_dev + ret << obj.format_township + ret << obj.format_community + ret << obj.format_group + ret << obj.format_street + ret << obj.format_streetNumber + ret << obj.format_name + ret << obj.format_buildingNumber + ret << obj.format_unitNumber + ret << obj.format_roomNumber + ret << obj.format_floor + ret << obj.format_address + map.put(obj.order, ret) } catch (Exception ex) { ex.printStackTrace() @@ -49,14 +64,14 @@ class ExportStandardResult { for (int i = 0; i < map.size(); i++) { data.add(map.get(i)) } - def headArr = ["城市", "地址", "标准化输出"] + def headArr = ["省","市","区","开发区","街道乡镇","居委会/社区", "组","路","路号","名称","楼栋", "单元","室号","楼层","优化后标准化地址"] List head = new ArrayList<>() for (String name: headArr) { List temp = new ArrayList<>() temp.add(name) head.add(temp) } - EasyExcel.write("F:\\工作\\基础建设\\标准化\\标准化融合后测试数据(标准化后).xlsx").head(head).sheet("测试数据").doWrite(data); + EasyExcel.write("F:\\工作\\基础建设\\标准化\\浙商疑问地址复测.xlsx").head(head).sheet("测试数据").doWrite(data); executorService.shutdown() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/StandardTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/StandardTest.groovy index b42c0b70d..8611995d2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/StandardTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/address/StandardTest.groovy @@ -6,6 +6,7 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import com.mongodb.DBObject import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService @@ -22,11 +23,13 @@ class StandardTest { static ExecutorService executorService = Executors.newFixedThreadPool(10) static DBCollection conn136 = MongoUtils.getCollectionByName("fangjia", "address_standard", "192.168.0.136", 27017) - + static final String IP = "192.168.0.19:39080" static void main(String[] args) { AtomicLong count = new AtomicLong(0) - CountDownLatch latch = new CountDownLatch(conn136.count(new BasicDBObject('status', 1)).intValue()) - conn136.find(new BasicDBObject('status', 1)).batchSize(3000).each {objT -> + // 查询条件 + DBObject query = new BasicDBObject('status', 1).append('flag', '浙商疑问地址复测') + CountDownLatch latch = new CountDownLatch(conn136.count(query).intValue()) + conn136.find(query).batchSize(3000).each {objT -> final def obj = objT executorService.submit(new Runnable() { @Override @@ -36,11 +39,44 @@ class StandardTest { def city = obj.city == null ? "" : obj.city HttpRequest request = new HttpRequest() - String result = request.get("http://192.168.20.86:8082/structure?city=" + URLEncoder.encode(city, "utf-8") + "&address=" + URLEncoder.encode(address, "utf-8"), "utf-8") + String result = request.get("http://" + IP + "/FangJiaAddressService/structure?city=" + URLEncoder.encode(city, "utf-8") + "&address=" + URLEncoder.encode(address, "utf-8"), "utf-8") JSONObject object = JSONObject.parse(result); if (object.get("status") == 0) { - def format_address = (((JSONObject) object.get("result")).get("formatAddress")) - conn136.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', new BasicDBObject("status", 0).append("format_address", format_address).append("flag", "已标准化输出"))) + JSONObject jsonResult = (JSONObject) object.get("result"); + def format_province = jsonResult.get("province") + def format_city = jsonResult.get("city") + def format_region = jsonResult.get("district") + def format_dev = jsonResult.get("dev") + def format_township = jsonResult.get("township") + def format_community = jsonResult.get("community") + def format_group = jsonResult.get("group") + def format_street = jsonResult.get("street") + def format_subStreet = jsonResult.get("subStreet") + def format_streetNumber = jsonResult.get("streetNumber") + def format_name = jsonResult.get("name") + def format_buildingNumber = jsonResult.get("buildingNumber") + def format_unitNumber = jsonResult.get("unitNumber") + def format_floor = jsonResult.get("floor") + def format_roomNumber = jsonResult.get("roomNumber") + def format_address = jsonResult.get("formatAddress") + + conn136.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', new BasicDBObject("status", 0) + .append("format_province", format_province) + .append("format_city", format_city) + .append("format_region", format_region) + .append("format_dev", format_dev) + .append("format_township", format_township) + .append("format_community", format_community) + .append("format_group", format_group) + .append("format_street", format_street) + .append("format_subStreet", format_subStreet) + .append("format_streetNumber", format_streetNumber) + .append("format_name", format_name) + .append("format_buildingNumber", format_buildingNumber) + .append("format_unitNumber", format_unitNumber) + .append("format_floor", format_floor) + .append("format_roomNumber", format_roomNumber) + .append("format_address", format_address))) } else { conn136.update(new BasicDBObject("_id", obj._id), new BasicDBObject('$set', new BasicDBObject("status", 2).append("flag", "标准化输出异常"))) } @@ -57,7 +93,7 @@ class StandardTest { } }) }; - latch.await() + latch.await(); executorService.shutdown() } }