merge

src/main/java/com/skyversation/poiaddr/addquery/AddressQueryEngine.java

@@ -91,15 +91,15 @@ public class AddressQueryEngine {
             }
         }
 //      TODO 如果多次尝试请求市中心地址后，还是请求失败就使用高德地名地址搜索
-        for (String addr : addrs) {
-            //  创建请求（要返回对应的搜索地址，返回地址，总分，市：cityname，街道：adname，村居：community）
-            addressResult = gdV3SearchByName(addr);
-            if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0) {
-                addressResult.setCode(AddressResultEnum.GD_SUCCESS);
-                addressResult.setMessage("成功");
-                return getCjWgWgwByLoc(addressResult);
-            }
-        }
+//        for (String addr : addrs) {
+//            //  创建请求（要返回对应的搜索地址，返回地址，总分，市：cityname，街道：adname，村居：community）
+//            addressResult = gdV3SearchByName(addr);
+//            if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0) {
+//                addressResult.setCode(AddressResultEnum.GD_SUCCESS);
+//                addressResult.setMessage("成功");
+//                return getCjWgWgwByLoc(addressResult);
+//            }
+//        }
         addressResult.setCode(AddressResultEnum.RESULT_NULL);
         addressResult.setMessage("失败");
         return addressResult;

src/main/java/com/skyversation/poiaddr/service/AreaService.java

@@ -194,9 +194,9 @@ public class AreaService {
             resultData.add(allAddressData.get(addr));
             return resultData;
         } else {
-            int sumSize = 20;
+            int sumSize = 100;
             for (String address : allAddressData.keySet()) {
-                if (address.contains(addr) && sumSize > 0) {
+                if (address != null && address.contains(addr) && sumSize > 0) {
                     sumSize--;
                     resultData.add(allAddressData.get(address));
                 }

src/main/java/com/skyversation/poiaddr/service/impl/YyskAddressStandardizationServiceImpl.java

@@ -469,8 +469,8 @@ public class YyskAddressStandardizationServiceImpl {
             try {
                 future.get();
             } catch (InterruptedException | ExecutionException e) {
-//                e.printStackTrace();
-//                System.err.println("线程异常：" + e);
+                e.printStackTrace();
+                System.err.println("线程异常：" + e);
             }
         }
         // 关闭线程池

src/main/java/com/skyversation/poiaddr/util/ExcelReaderUtils.java

@@ -119,6 +119,7 @@ public class ExcelReaderUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        System.out.println("写入文件完成：" + filePath);
     }