merge

.gitignore

@@ -19,6 +19,10 @@ target/
 *.iml
 *.ipr
 
+/src/main/java/com/skyversation/poiaddr/controller/TEST.java
+/src/main/resources/geojson/青浦区综合网格.geojson
+/src/main/resources/结果2.xlsx
+
 ### NetBeans ###
 /nbproject/private/
 /nbbuild/
@@ -32,3 +36,4 @@ build/
 ### VS Code ###
 .vscode/
 output/
+/src/main/java/com/skyversation/poiaddr/ignore/

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

@@ -144,7 +144,7 @@ public class AreaService {
                 // 创建 ClassPathResource 对象，指定静态文件的路径
                 ClassPathResource resource = new ClassPathResource(path[j]);
                 // 获取文件的输入流
-                reader = new BufferedReader(new InputStreamReader(resource.getInputStream()));
+                reader = new BufferedReader(new InputStreamReader(resource.getInputStream(),"UTF-8"));
                 String line;
                 StringBuilder sb = new StringBuilder();
                 while ((line = reader.readLine()) != null) {

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

@@ -175,18 +175,22 @@ public class DataCallBackService {
     public void failDataCallBack(List<String> addr){
         for (String addrStr:addr){
             failES.execute(()->{
-                System.out.println("尝试回流无结果数据："+addrStr);
-                SplitAddress splitAddress = ShanghaiAddressSplitUtil.splitBestAddress(addrStr);
-                if (splitAddress.getStatus()==3||splitAddress.getStatus()==-1){
-                    System.out.println("拒绝回流，检测到非地址");
-                    return;
+                try {
+                    System.out.println("尝试回流无结果数据："+addrStr);
+                    SplitAddress splitAddress = ShanghaiAddressSplitUtil.splitBestAddress(addrStr);
+                    if (splitAddress.getStatus()==3||splitAddress.getStatus()==-1){
+                        System.out.println("拒绝回流，检测到非地址");
+                        return;
+                    }
+                    int id = tAddressCallbackRep.findMaxId().orElse(0)+1;
+                    TAddressCallback tAddressCallback = new TAddressCallback(id, Instant.now(),addrStr, splitAddress.getAddr(),
+                            splitAddress.getProvince(),splitAddress.getCity(),splitAddress.getStreet(), splitAddress.getCommunity(),
+                            (short) 0, (short) 0);
+                    tAddressCallbackRep.save(tAddressCallback);
+                    System.out.println("回流成功,等待进一检查处理");
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-                int id = tAddressCallbackRep.findMaxId().orElse(0)+1;
-                TAddressCallback tAddressCallback = new TAddressCallback(id, Instant.now(),addrStr, splitAddress.getAddr(),
-                        splitAddress.getProvince(),splitAddress.getCity(),splitAddress.getStreet(), splitAddress.getCommunity(),
-                        (short) 0, (short) 0);
-                tAddressCallbackRep.save(tAddressCallback);
-                System.out.println("回流成功,等待进一检查处理");
             });
         }
     }