| 
					
				 | 
			
			
				@@ -215,8 +215,8 @@ public class PoiAddressController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         AddressResult addressResult = AddressQueryEngine.getInstance().commonSearchByName(new String[]{fileDataDto.getAddr1().isEmpty() ? fileDataDto.getAddr2() : fileDataDto.getAddr1()}, AddressLevel.values()[fileDataDto.getMatchingLevel() - 1]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if (addressResult != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if (addressResult.getData() == null || addressResult.getData().size() < 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                fileDataDto.getProperties().put("户籍街镇", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                fileDataDto.getProperties().put("户籍居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                fileDataDto.getProperties().put("所属街道", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                fileDataDto.getProperties().put("所属居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 fileDataDto.getProperties().put("纬度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 fileDataDto.getProperties().put("经度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 fileDataDto.getProperties().put("搜索结果地址", null); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -227,7 +227,7 @@ public class PoiAddressController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         if (resultAddrKey != null && contentBean.getLon() != null && contentBean.getLat() != null && contentBean.getCjJson() != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             String lng = contentBean.getLat() + ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             String lat = contentBean.getLon() + ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                            fileDataDto.getProperties().put("所属街道", contentBean.getCjJson().getString("所属街镇")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                            fileDataDto.getProperties().put("所属街道", contentBean.getCjJson().getString("所属街道")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("所属居委", contentBean.getCjJson().getString("所属居委")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("纬度", lng); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("经度", lat); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -235,16 +235,16 @@ public class PoiAddressController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             System.out.println("成功:" + lat + "," + lng); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         } else if (resultAddrKey != null && contentBean.getLon() != null && contentBean.getLat() != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                            fileDataDto.getProperties().put("户籍街镇", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                            fileDataDto.getProperties().put("户籍居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                            fileDataDto.getProperties().put("所属街道", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                            fileDataDto.getProperties().put("所属居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("纬度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("经度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             fileDataDto.getProperties().put("搜索结果地址", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    fileDataDto.getProperties().put("户籍街镇", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    fileDataDto.getProperties().put("户籍居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    fileDataDto.getProperties().put("所属街道", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    fileDataDto.getProperties().put("所属居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     fileDataDto.getProperties().put("纬度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     fileDataDto.getProperties().put("经度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     fileDataDto.getProperties().put("搜索结果地址", null); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -253,8 +253,8 @@ public class PoiAddressController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        fileDataDto.getProperties().put("户籍街镇", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        fileDataDto.getProperties().put("户籍居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        fileDataDto.getProperties().put("所属街道", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        fileDataDto.getProperties().put("所属居委", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         fileDataDto.getProperties().put("纬度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         fileDataDto.getProperties().put("经度", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         fileDataDto.getProperties().put("搜索结果地址", null); 
			 |