commit d97264166a1ad74ae4d3560eaa55210605733cf9 Author: 沈健 Date: Tue Nov 9 11:46:43 2021 +0800 本地化部署测试初始化 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/lib/commons-collections4-4.1.jar b/lib/commons-collections4-4.1.jar new file mode 100644 index 0000000..43a9413 Binary files /dev/null and b/lib/commons-collections4-4.1.jar differ diff --git a/lib/easyexcel-2.2.8-sources.jar b/lib/easyexcel-2.2.8-sources.jar new file mode 100644 index 0000000..64366a7 Binary files /dev/null and b/lib/easyexcel-2.2.8-sources.jar differ diff --git a/lib/easyexcel-2.2.8.jar b/lib/easyexcel-2.2.8.jar new file mode 100644 index 0000000..138f3fe Binary files /dev/null and b/lib/easyexcel-2.2.8.jar differ diff --git a/lib/fastjson-1.2.49.jar b/lib/fastjson-1.2.49.jar new file mode 100644 index 0000000..10059a6 Binary files /dev/null and b/lib/fastjson-1.2.49.jar differ diff --git a/lib/poi-3.17.jar b/lib/poi-3.17.jar new file mode 100644 index 0000000..353ce76 Binary files /dev/null and b/lib/poi-3.17.jar differ diff --git a/lib/poi-ooxml-3.17.jar b/lib/poi-ooxml-3.17.jar new file mode 100644 index 0000000..68086e8 Binary files /dev/null and b/lib/poi-ooxml-3.17.jar differ diff --git a/lib/poi-ooxml-schemas-3.17.jar b/lib/poi-ooxml-schemas-3.17.jar new file mode 100644 index 0000000..2e9b3e7 Binary files /dev/null and b/lib/poi-ooxml-schemas-3.17.jar differ diff --git a/lib/slf4j-api-1.7.30.jar b/lib/slf4j-api-1.7.30.jar new file mode 100644 index 0000000..29ac26f Binary files /dev/null and b/lib/slf4j-api-1.7.30.jar differ diff --git a/lib/spring-core-5.2.8.RELEASE.jar b/lib/spring-core-5.2.8.RELEASE.jar new file mode 100644 index 0000000..a4eb33a Binary files /dev/null and b/lib/spring-core-5.2.8.RELEASE.jar differ diff --git a/lib/spring-jcl-5.2.8.RELEASE.jar b/lib/spring-jcl-5.2.8.RELEASE.jar new file mode 100644 index 0000000..4471714 Binary files /dev/null and b/lib/spring-jcl-5.2.8.RELEASE.jar differ diff --git a/lib/spring-web-5.2.8.RELEASE.jar b/lib/spring-web-5.2.8.RELEASE.jar new file mode 100644 index 0000000..a299e51 Binary files /dev/null and b/lib/spring-web-5.2.8.RELEASE.jar differ diff --git a/lib/xmlbeans-2.6.0.jar b/lib/xmlbeans-2.6.0.jar new file mode 100644 index 0000000..d1b6627 Binary files /dev/null and b/lib/xmlbeans-2.6.0.jar differ diff --git a/out/production/deploy/BatchTest.class b/out/production/deploy/BatchTest.class new file mode 100644 index 0000000..7389bf5 Binary files /dev/null and b/out/production/deploy/BatchTest.class differ diff --git a/out/production/deploy/DivisionStructuredAddress.class b/out/production/deploy/DivisionStructuredAddress.class new file mode 100644 index 0000000..ff3391a Binary files /dev/null and b/out/production/deploy/DivisionStructuredAddress.class differ diff --git a/out/production/deploy/ExcelUtils$SimpleExcelListener.class b/out/production/deploy/ExcelUtils$SimpleExcelListener.class new file mode 100644 index 0000000..2b5cd29 Binary files /dev/null and b/out/production/deploy/ExcelUtils$SimpleExcelListener.class differ diff --git a/out/production/deploy/ExcelUtils.class b/out/production/deploy/ExcelUtils.class new file mode 100644 index 0000000..1515ea1 Binary files /dev/null and b/out/production/deploy/ExcelUtils.class differ diff --git a/out/production/deploy/FangJiaApiResponse.class b/out/production/deploy/FangJiaApiResponse.class new file mode 100644 index 0000000..66517cc Binary files /dev/null and b/out/production/deploy/FangJiaApiResponse.class differ diff --git a/out/production/deploy/FangJiaResponseMsg.class b/out/production/deploy/FangJiaResponseMsg.class new file mode 100644 index 0000000..f106f03 Binary files /dev/null and b/out/production/deploy/FangJiaResponseMsg.class differ diff --git a/out/production/deploy/FangJiaResponseStatus.class b/out/production/deploy/FangJiaResponseStatus.class new file mode 100644 index 0000000..d26d68e Binary files /dev/null and b/out/production/deploy/FangJiaResponseStatus.class differ diff --git a/out/production/deploy/RiskLevelInfo.class b/out/production/deploy/RiskLevelInfo.class new file mode 100644 index 0000000..13ad4b1 Binary files /dev/null and b/out/production/deploy/RiskLevelInfo.class differ diff --git a/out/production/deploy/RiskLevelTest.class b/out/production/deploy/RiskLevelTest.class new file mode 100644 index 0000000..4e45c23 Binary files /dev/null and b/out/production/deploy/RiskLevelTest.class differ diff --git a/out/production/deploy/StructuredAddress.class b/out/production/deploy/StructuredAddress.class new file mode 100644 index 0000000..03f442b Binary files /dev/null and b/out/production/deploy/StructuredAddress.class differ diff --git a/src/BatchTest.java b/src/BatchTest.java new file mode 100644 index 0000000..03d16e9 --- /dev/null +++ b/src/BatchTest.java @@ -0,0 +1,164 @@ +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.util.StringUtils; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicLong; + +public class BatchTest { + + static final String IP = "192.168.0.19:39080"; + final String sourceFilePath = "D:\\goojia\\20210715090234.xlsx"; + final String aimFilePath = "D:\\goojia\\20210715090234最新结果.xlsx"; + final int column = 2; + final Integer nThreads = 20; + + public static void main(String[] args) throws FileNotFoundException, InterruptedException { + BatchTest test = new BatchTest(); + test.run(); + } + + public void run() throws FileNotFoundException, InterruptedException { + ExecutorService executorService = Executors.newFixedThreadPool(nThreads); + Map> dataMap = new ConcurrentHashMap<>(); + AtomicLong count = new AtomicLong(0); + String[] headArr = new String[]{"ID", "地址", "省份", "城市", "区域", "乡镇街道", "街道编码", "居委村委", "标准化地址", "是否涉农", "地址验证"}; + List> head = this.formatHead(headArr); + // 默认两行数据 + List> dataList = ExcelUtils.read(new FileInputStream(sourceFilePath)); + if (dataList.size() > 100000) { + throw new RuntimeException("该批次数据量超过100000条"); + } + Set set = new HashSet<>(); + dataList.forEach(data -> { + if (data.size() == column ) { + set.add(data.get(column - 1)); + } else { + // 存在为空情况,需保持一致 + set.add(""); + data.add(""); + } + }); + + try { + CountDownLatch latch = new CountDownLatch(set.size()); + RestTemplate restTemplate = new RestTemplate(); + for (String addressTemp : set) { + final String address = addressTemp; + executorService.submit(() -> { + try { + String response = restTemplate.getForObject("http://" + IP + "/FangJiaAddressService/fiveDivisionStructure?address={address}", String.class, address); + FangJiaApiResponse apiResponse = JSONObject.parseObject(response, FangJiaApiResponse.class); + if (FangJiaApiResponse.ok().getStatus() == apiResponse.getStatus()) { + List addressList = new ArrayList<>(); + DivisionStructuredAddress structuredAddress = JSONObject.toJavaObject(apiResponse.getResult(), DivisionStructuredAddress.class); + addressList.add(structuredAddress.getProvince()); + addressList.add(structuredAddress.getCity()); + addressList.add(structuredAddress.getDistrict()); + addressList.add(structuredAddress.getTownship()); + addressList.add(structuredAddress.getTownshipCode()); + addressList.add(structuredAddress.getCommunity()); + addressList.add(structuredAddress.getFormatAddress()); + addressList.add(structuredAddress.getIsAgriculture()); + addressList.add(structuredAddress.getAddrVerify()); + dataMap.put(address, addressList); + } + } catch (Exception ex) { + ex.printStackTrace(); + System.out.println("五秒后重试"); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + + } + String response = restTemplate.getForObject("http://" + IP + "/FangJiaAddressService/fiveDivisionStructure?address={address}", String.class, address); + FangJiaApiResponse apiResponse = JSONObject.parseObject(response, FangJiaApiResponse.class); + try { + if (FangJiaApiResponse.ok().getStatus() == apiResponse.getStatus()) { + List addressList = new ArrayList<>(); + DivisionStructuredAddress structuredAddress = JSONObject.toJavaObject(apiResponse.getResult(), DivisionStructuredAddress.class); + addressList.add(structuredAddress.getProvince()); + addressList.add(structuredAddress.getCity()); + addressList.add(structuredAddress.getDistrict()); + addressList.add(structuredAddress.getTownship()); + addressList.add(structuredAddress.getTownshipCode()); + addressList.add(structuredAddress.getCommunity()); + addressList.add(structuredAddress.getFormatAddress()); + addressList.add(structuredAddress.getIsAgriculture()); + addressList.add(structuredAddress.getAddrVerify()); + dataMap.put(address, addressList); + } + } catch (Exception e) { + System.out.println("give up"); + } + } finally { + latch.countDown(); + count.incrementAndGet(); + synchronized (this) { + if (count.longValue() % 1000 == 0) { + System.out.println("已标准化处理" + count.longValue() + "条地址"); + } + } + } + }); + } + latch.await(); + System.out.println("已完成该批次地址标准化"); + + for (List data : dataList) { + String address = ""; + if (data.size() == column) { + address = data.get(column - 1); + } else { + address = ""; + } + List addressRow = dataMap.get(address); + if (CollectionUtils.isNotEmpty(addressRow)) { + data.addAll(addressRow); + } + } + } catch (InterruptedException e) { + e.printStackTrace(); + } finally { + executorService.shutdown(); + } + + + while (true) { + try { + ExcelWriter excelWriter = EasyExcel.write(aimFilePath).build(); + WriteSheet writeSheet = EasyExcel.writerSheet(0, "标准化结果").head(head).build(); + excelWriter.write(dataList, writeSheet); + excelWriter.finish(); + break; + } catch (Exception ex) { + ex.printStackTrace(); + System.out.println("五秒后重试"); + Thread.sleep(5000); + } + } + } + + private List> formatHead(String[] headArr) { + List> head = new ArrayList<>(); + for (String name: headArr) { + List temp = new ArrayList<>(); + temp.add(name); + head.add(temp); + } + return head; + } +} diff --git a/src/DivisionStructuredAddress.java b/src/DivisionStructuredAddress.java new file mode 100644 index 0000000..fa02de8 --- /dev/null +++ b/src/DivisionStructuredAddress.java @@ -0,0 +1,53 @@ + +public class DivisionStructuredAddress extends StructuredAddress { + + private String townshipCode; + + private String communityCode; + + private String isAgriculture; + + private Double bdLng; + + private Double bdLat; + + public String getCommunityCode() { + return communityCode; + } + + public void setCommunityCode(String communityCode) { + this.communityCode = communityCode; + } + + public String getIsAgriculture() { + return isAgriculture; + } + + public Double getBdLng() { + return bdLng; + } + + public void setBdLng(Double bdLng) { + this.bdLng = bdLng; + } + + public Double getBdLat() { + return bdLat; + } + + public void setBdLat(Double bdLat) { + this.bdLat = bdLat; + } + + public void setIsAgriculture(String isAgriculture) { + this.isAgriculture = isAgriculture; + } + + public String getTownshipCode() { + return townshipCode; + } + + public void setTownshipCode(String townshipCode) { + this.townshipCode = townshipCode; + } +} diff --git a/src/ExcelUtils.java b/src/ExcelUtils.java new file mode 100644 index 0000000..83ff1ac --- /dev/null +++ b/src/ExcelUtils.java @@ -0,0 +1,51 @@ +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * excel读写工具类 + * + * @author shenjian + * @since 2021/07/12 + */ +public class ExcelUtils { + + public static List> read(InputStream inputStream) { + SimpleExcelListener listener = new SimpleExcelListener(); + ExcelReader excelReader = EasyExcelFactory.read(inputStream, null, listener) + .headRowNumber(1).build(); + excelReader.readAll(); + List> dataList = listener.getDataList(); + excelReader.finish(); + return dataList; + } + + public static class SimpleExcelListener extends AnalysisEventListener { + private List> dataList = new ArrayList<>(); + + @Override + public void invoke(Object o, AnalysisContext analysisContext) { + Map map = (Map) o; + dataList.add(new ArrayList<>(map.values())); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + + } + + List> getDataList() { + return dataList; + } + + void setDataList(List> dataList) { + this.dataList = dataList; + } + } +} diff --git a/src/FangJiaApiResponse.java b/src/FangJiaApiResponse.java new file mode 100644 index 0000000..418afea --- /dev/null +++ b/src/FangJiaApiResponse.java @@ -0,0 +1,124 @@ + +import java.io.Serializable; + +public class FangJiaApiResponse implements Serializable { + + private Integer status; + private Integer msgCode; + private Long count; + private String msg; + private T result; + + public FangJiaApiResponse(Integer status, Integer msgCode, String msg) { + this.status = status; + this.msgCode = msgCode; + this.msg = msg; + } + + public FangJiaApiResponse() { + + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public T getResult() { + return result; + } + + public FangJiaApiResponse setResult(T result) { + this.result = result; + return this; + } + + public FangJiaApiResponse setCount(Long count) { + this.count = count; + return this; + } + + public int getMsgCode() { + return msgCode; + } + + public void setMsgCode(int msgCode) { + this.msgCode = msgCode; + } + + public Long getCount() { + return count; + } + + /** + * 构造一个成功状态的Api Response + * @param + * @return + */ + public static FangJiaApiResponse ok(){ + return new FangJiaApiResponse(FangJiaResponseStatus.OK.status, FangJiaResponseMsg.OK_MSG.msgCode, FangJiaResponseMsg.OK_MSG.msg); + } + + + /** + * 构造一个成功状态的Api Response + * @param result + * @param + * @return + */ + public static FangJiaApiResponse ok(T result){ + return new FangJiaApiResponse(FangJiaResponseStatus.OK.status, FangJiaResponseMsg.OK_MSG.msgCode, FangJiaResponseMsg.OK_MSG.msg).setResult(result); + } + + /** + * 返回一个参数错误的Api Response + * @param responseMsgCode + * @param msg + * @param + * @return + */ + public static FangJiaApiResponse badRequest(FangJiaResponseMsg responseMsgCode, String msg){ + if(msg == null){ + msg = responseMsgCode.msg; + } + return new FangJiaApiResponse(FangJiaResponseStatus.FAIL.status, responseMsgCode.msgCode, msg); + } + + public static FangJiaApiResponse badRequest(String msg){ + return badRequest(FangJiaResponseMsg.BAD_REQUEST_MSG, msg); + } + + public static FangJiaApiResponse serverError(){ + return new FangJiaApiResponse<>(FangJiaResponseStatus.FAIL.status,FangJiaResponseMsg.SERVER_ERROR_MSG.msgCode, FangJiaResponseMsg.SERVER_ERROR_MSG.msg); + } + + + /** + * 返回一个参数错误的Api Response + * @param + * @return + */ + public static FangJiaApiResponse badRequest(){ + return badRequest(FangJiaResponseMsg.BAD_REQUEST_MSG, FangJiaResponseMsg.BAD_REQUEST_MSG.msg); + } + + /** + * 返回一个License过期的Api Response + * @param + * @return + */ + public static FangJiaApiResponse licenseExpired(){ + return new FangJiaApiResponse(FangJiaResponseStatus.FAIL.status, FangJiaResponseMsg.LICENSE_EXPIRED.msgCode, FangJiaResponseMsg.LICENSE_EXPIRED.msg ); + } +} diff --git a/src/FangJiaResponseMsg.java b/src/FangJiaResponseMsg.java new file mode 100644 index 0000000..4684c0f --- /dev/null +++ b/src/FangJiaResponseMsg.java @@ -0,0 +1,14 @@ + +public enum FangJiaResponseMsg { + + OK_MSG(200, "ok"), BAD_REQUEST_MSG(400, "请求参数非法"), + LICENSE_EXPIRED(403, "授权已失效"), + SERVER_ERROR_MSG(500, "服务器异常"); + public String msg; + public Integer msgCode; + + FangJiaResponseMsg(Integer msgCode, String msg) { + this.msg = msg; + this.msgCode = msgCode; + } +} diff --git a/src/FangJiaResponseStatus.java b/src/FangJiaResponseStatus.java new file mode 100644 index 0000000..5d11984 --- /dev/null +++ b/src/FangJiaResponseStatus.java @@ -0,0 +1,11 @@ +public enum FangJiaResponseStatus { + + OK(0, "ok"), FAIL(1, "失败"); + public final int status; + public final String msg; + FangJiaResponseStatus(int status, String msg) { + this.status = status; + this.msg = msg; + } + +} diff --git a/src/RiskLevelInfo.java b/src/RiskLevelInfo.java new file mode 100644 index 0000000..33112d2 --- /dev/null +++ b/src/RiskLevelInfo.java @@ -0,0 +1,12 @@ +public class RiskLevelInfo { + + private String riskLevel; + + public String getRiskLevel() { + return riskLevel; + } + + public void setRiskLevel(String riskLevel) { + this.riskLevel = riskLevel; + } +} diff --git a/src/RiskLevelTest.java b/src/RiskLevelTest.java new file mode 100644 index 0000000..a383654 --- /dev/null +++ b/src/RiskLevelTest.java @@ -0,0 +1,146 @@ +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.web.client.RestTemplate; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicLong; + +/** + * 风险评级测试 + */ +public class RiskLevelTest { + static final String IP = "open.fangjia.com"; + final String sourceFilePath = "D:\\goojia\\风险评级测试.xlsx"; + final String aimFilePath = "D:\\goojia\\风险评级测试结果.xlsx"; + final int column = 2; + final Integer nThreads = 1; + + public static void main(String[] args) throws FileNotFoundException, InterruptedException { + RiskLevelTest test = new RiskLevelTest(); + test.run(); + } + + public void run() throws FileNotFoundException, InterruptedException { + ExecutorService executorService = Executors.newFixedThreadPool(nThreads); + Map> dataMap = new ConcurrentHashMap<>(); + AtomicLong count = new AtomicLong(0); + String[] headArr = new String[]{"ID", "地址", "评级"}; + List> head = this.formatHead(headArr); + // 默认两行数据 + List> dataList = ExcelUtils.read(new FileInputStream(sourceFilePath)); + if (dataList.size() > 100000) { + throw new RuntimeException("该批次数据量超过100000条"); + } + Set set = new HashSet<>(); + dataList.forEach(data -> { + if (data.size() == column ) { + set.add(data.get(column - 1)); + } else { + // 存在为空情况,需保持一致 + set.add(""); + data.add(""); + } + }); + + try { + CountDownLatch latch = new CountDownLatch(set.size()); + RestTemplate restTemplate = new RestTemplate(); + for (String addressTemp : set) { + final String address = addressTemp; + executorService.submit(() -> { + try { + String response = restTemplate.getForObject("http://" + IP + "/address/risk?address={address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB", String.class, address); + FangJiaApiResponse apiResponse = JSONObject.parseObject(response, FangJiaApiResponse.class); + if ("ok".equals(apiResponse.getMsg())) { + List addressList = new ArrayList<>(); + RiskLevelInfo riskLevelInfo = JSONObject.toJavaObject(apiResponse.getResult(), RiskLevelInfo.class); + addressList.add(riskLevelInfo.getRiskLevel()); + dataMap.put(address, addressList); + } + } catch (Exception ex) { + ex.printStackTrace(); + System.out.println("五秒后重试"); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + + } + String response = restTemplate.getForObject("http://" + IP + "/address/risk?address={address}", String.class, address); + FangJiaApiResponse apiResponse = JSONObject.parseObject(response, FangJiaApiResponse.class); + try { + if ("ok".equals(apiResponse.getMsg())) { + List addressList = new ArrayList<>(); + RiskLevelInfo riskLevelInfo = JSONObject.toJavaObject(apiResponse.getResult(), RiskLevelInfo.class); + addressList.add(riskLevelInfo.getRiskLevel()); + dataMap.put(address, addressList); + } + } catch (Exception e) { + System.out.println("give up"); + } + } finally { + latch.countDown(); + count.incrementAndGet(); + synchronized (this) { + if (count.longValue() % 1000 == 0) { + System.out.println("已风险评级" + count.longValue() + "条地址"); + } + } + } + }); + } + latch.await(); + System.out.println("已完成该批次地址风险评级"); + + for (List data : dataList) { + String address = ""; + if (data.size() == column) { + address = data.get(column - 1); + } else { + address = ""; + } + List addressRow = dataMap.get(address); + if (CollectionUtils.isNotEmpty(addressRow)) { + data.addAll(addressRow); + } + } + } catch (InterruptedException e) { + e.printStackTrace(); + } finally { + executorService.shutdown(); + } + + + while (true) { + try { + ExcelWriter excelWriter = EasyExcel.write(aimFilePath).build(); + WriteSheet writeSheet = EasyExcel.writerSheet(0, "风险评级结果").head(head).build(); + excelWriter.write(dataList, writeSheet); + excelWriter.finish(); + break; + } catch (Exception ex) { + ex.printStackTrace(); + System.out.println("五秒后重试"); + Thread.sleep(5000); + } + } + } + + private List> formatHead(String[] headArr) { + List> head = new ArrayList<>(); + for (String name: headArr) { + List temp = new ArrayList<>(); + temp.add(name); + head.add(temp); + } + return head; + } +} diff --git a/src/StructuredAddress.java b/src/StructuredAddress.java new file mode 100644 index 0000000..4f10446 --- /dev/null +++ b/src/StructuredAddress.java @@ -0,0 +1,174 @@ +public class StructuredAddress { + + private String province; + private String city; + private String district; + private String dev; + private String township; + private String street; + private String subStreet; + private String streetNumber; + private String community; + private String group; + private String name; + private String buildingNumber; + private String unitNumber; + private String floor; + private String roomNumber; + private Double lng; + private Double lat; + private String formatAddress; + private String addrVerify; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBuildingNumber() { + return buildingNumber; + } + + public void setBuildingNumber(String buildingNumber) { + this.buildingNumber = buildingNumber; + } + + public String getUnitNumber() { + return unitNumber; + } + + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getSubStreet() { + return subStreet; + } + + public void setSubStreet(String subStreet) { + this.subStreet = subStreet; + } + + public String getFormatAddress() { + return formatAddress; + } + + public void setFormatAddress(String formatAddress) { + this.formatAddress = formatAddress; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } +}