行政区划对照异常修复

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

@@ -79,7 +79,7 @@ public class Constant {
             "|100000|110000|120000|130000|140000|150000|160000|170000|180000|190000|200000|220000|970000|980000|990000";
 
 //    public static String AMAP_KEY = "38511ab3763ab97a10bd68ad8210933d";
-    public static String AMAP_KEY = "161e0c673807a9586ba5a115da2a0112";
+    public static String AMAP_KEY = "28f736e6421ff3577280bdca9a0ce1d9";
 
     //    oauth和dms搭建服务器地址
     public static String ServerBaseUrl = "http://121.43.55.7:";

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

@@ -149,7 +149,7 @@ public class TransfromDataTool {
                         amapAddressV3.setAdname(ext_data.get("region_qx").toString());
                     }
                     if (!ext_data.get("region_jd").toString().isEmpty()) {
-                        amapAddressV3.setStreetTTown(ext_data.get("region_jd").toString());
+                        amapAddressV3.setStreetTown(ext_data.get("region_jd").toString());
                     }
                     if (!ext_data.get("region_jw").toString().isEmpty()) {
                         amapAddressV3.setResidentialCommittee(ext_data.get("region_jw").toString());
@@ -254,8 +254,10 @@ public class TransfromDataTool {
                 content.setScore(jsonObject.getString("总分"));
                 content.setSearchAddress(jsonObject.getString("searchAddress"));
                 content.setPname(jsonObject.getString("pname"));
-                content.setCityname(jsonObject.getString("cityname"));
-                content.setAdname(jsonObject.getString("adname"));
+                content.setCityname(jsonObject.getString("adname"));
+                if (jsonObject.containsKey("street_town") && !jsonObject.getString("street_town").isEmpty()) {
+                    content.setAdname(jsonObject.getString("street_town"));
+                }
                 content.setType(jsonObject.getString("type"));
                 content.setAddress(content.getPname() + content.getAdname() + jsonObject.getString("address"));
                 content.setName(jsonObject.getString("name"));

src/main/java/com/skyversation/poiaddr/bean/AddressResult.java

@@ -26,7 +26,7 @@ public class AddressResult {
     public static class ContentBean implements Serializable {
         // 省份名称
         private String pname;
-        // 城市名称
+        // 应该是行政区划
         private String cityname;
         // 街镇名称
         private String adname;

src/main/java/com/skyversation/poiaddr/entity/AmapAddressV3.java

@@ -93,8 +93,8 @@ public class AmapAddressV3  implements Serializable {
    	@Column(name = "create_time" )
 	private Date createTime;
 
-   	@Column(name = "street_tTown" )
-	private String streetTTown;
+   	@Column(name = "street_town" )
+	private String streetTown;
 
    	@Column(name = "residential_committee" )
 	private String residentialCommittee;