diff --git a/src/BatchTest.java b/src/BatchTest.java index fd12d21..ee7a525 100644 --- a/src/BatchTest.java +++ b/src/BatchTest.java @@ -38,7 +38,9 @@ public class BatchTest { Map> dataMap = new ConcurrentHashMap<>(); AtomicLong count = new AtomicLong(0); String[] headArr = new String[]{ - "ID", "地址", "省份", "城市", "区域", "乡镇街道", "街道编码", "居委村委", "标准化地址", "是否农户地址", "地址验证", "是否县级市", "是否市辖建制镇", "省国家级开发区名称", "开发区等级", "经度", "纬度", "百度经度", "百度纬度"}; + "ID", "地址", "省份", "城市", "区域", "乡镇街道", "街道编码", "居委村委", "标准化地址", "是否农户地址", "地址验证", "是否县级市", "是否县城城区", "是否市辖建制镇", "省国家级开发区名称", "开发区等级", "经度", "纬度", "百度经度", "百度纬度", + "是否县政府", "所属区域" + }; List> head = this.formatHead(headArr); // 默认两行数据 String aimFilePath = file.substring(0, file.lastIndexOf(".xlsx")) + "结果.xlsx"; @@ -102,7 +104,8 @@ public class BatchTest { result.add(villageIdentifyResultDto.getBdLng().toString()); result.add(villageIdentifyResultDto.getBdLat().toString()); } -// result.add(villageIdentifyResultDto.getCountyGov()); + result.add(villageIdentifyResultDto.getCountyGov()); + result.add(villageIdentifyResultDto.getAddrArea()); dataMap.put(address, result); diff --git a/src/dto/AddressResultDto.java b/src/dto/AddressResultDto.java index a379571..c2cece4 100644 --- a/src/dto/AddressResultDto.java +++ b/src/dto/AddressResultDto.java @@ -62,6 +62,10 @@ public class AddressResultDto { private Double bdLat; private Double lng; private Double lat; + /** + * 所属区域 + */ + private String addrArea; public String getIsAgriculture() { return isAgriculture; @@ -358,4 +362,12 @@ public class AddressResultDto { public void setCommunitySource(String communitySource) { this.communitySource = communitySource; } + + public String getAddrArea() { + return addrArea; + } + + public void setAddrArea(String addrArea) { + this.addrArea = addrArea; + } }