优化区镇判断逻辑

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

@@ -126,13 +126,6 @@ public class TransfromDataTool {
             if (!jsonObject.getString("address").isEmpty()) {
                 addressList.add(jsonObject.getString("address"));
             }
-//          从返回地址信息里面判断区，首先得到上海市所有的区，然后遍历区名
-            for (String area : Constant.allAreas) {
-                if (content.getAddress().contains(area)) {
-                    content.setAdname(area);
-                    break;
-                }
-            }
             if (!jsonObject.getString("std_address").isEmpty()) {
                 addressList.add(jsonObject.getString("std_address"));
             }

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

@@ -238,6 +238,7 @@ public class YyskAddressStandardizationServiceImpl {
                                 String resultAddrKey = contentBean.getAddress();
                                 if (resultAddrKey != null && contentBean.getLon() != null && contentBean.getLat() != null && AddressTools.isOtherDistrictThanSongJiang2(resultAddrKey)) {
                                     resultAddrKey = AddressTools.getInstance().deleteStr(contentBean.getAddress());
+                                    contentBean.setAdname(AddressTools.parseAddressCJ(resultAddrKey)[2]);
                                     if (contentBean.getAdname() != null && !contentBean.getAdname().isEmpty()) {
                                         item.setStreetTown(contentBean.getAdname());
                                     } else if (contentBean.getTownJson() != null && contentBean.getTownJson().getString("name") != null) {
@@ -245,6 +246,7 @@ public class YyskAddressStandardizationServiceImpl {
                                     } else {
                                         item.setStreetTown("");
                                     }
+                                    contentBean.setCityname(AddressTools.parseAddressCJ(resultAddrKey)[1]);
                                     item.setMarket(AddressTools.isOtherDistrictThanShangHai(resultAddrKey));
                                     if (contentBean.getCityname() != null && !contentBean.getCityname().isEmpty()) {
                                         item.setDistinguish(contentBean.getCityname());