jiangjiazhi / regional-platform

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 31 additions and 6 deletions

...	...	@@ -251,5 +251,21 @@
251	251	objectResponse.setErrormsg("成功");
252	252	return objectResponse;
253	253	}
	254	+
	255	+ public String getAddressName(String address) {
	256	+
	257	+ List<String> items = AddressUtil.getAddress(address);
	258	+ StringBuffer sb = new StringBuffer();
	259	+ if (items != null && items.size() >= 4)
	260	+ {
	261	+ for (String ad : items) {
	262	+ sb.append(ad);
	263	+ sb.append(",");
	264	+ }
	265	+ return sb.substring(0,sb.length()-1);
	266	+ }
	267	+
	268	+ return "";
	269	+ }
254	270	}

...	...	@@ -336,7 +336,7 @@
336	336	@Override
337	337	public String getAreaCode(String areaName) {
338	338	String code = masterOrganizationMapper.getAreaCode(areaName);
339		- return StringUtils.isNotEmpty(code) ? code : "110000";
	339	+ return StringUtils.isNotEmpty(code) ? code : "110100";
340	340	}
341	341
342	342	}

...	...	@@ -305,7 +305,7 @@
305	305	</select>
306	306
307	307	<select id="getAreaCode" resultType="String" parameterType="String">
308		- select code from area a where a.name=#{areaName}
	308	+ select code from area a where a.name=#{areaName} limit 0,1
309	309	</select>
310	310	</mapper>

...	...	@@ -47,10 +47,14 @@
47	47	}
48	48
49	49	public static void main(String[] ages) {
50		- List<String> addrs = AddressUtil.getAddress("辽宁省建平县国营八家农场XX村2-040");
	50	+ StringBuffer sb = new StringBuffer();
	51	+ List<String> addrs = AddressUtil.getAddress("河北省承德市宽城满族自治县峪耳崖金矿");
51	52	for (String ad : addrs) {
52		- System.out.println(ad);
	53	+ sb.append(ad);
	54	+ sb.append(",");
53	55	}
	56	+ String s = sb.substring(0,sb.length()-1);
	57	+ System.out.println(s);
54	58	}
55	59	}

...	...	@@ -536,9 +536,7 @@
536	536	@RequestMapping(value = "/getAreaCode", method = RequestMethod.GET)
537	537	@ResponseBody
538	538	public String getAreaCode(@RequestParam(value = "areaName", required = true) String areaName) {
539		-
540	539	String areaCode = organizationService.getAreaCode(areaName);
541		- System.out.println(areaName+"==="+areaCode);
542	540	return areaCode;
543	541	}
544	542	}

...	...	@@ -203,5 +203,12 @@
203	203	//address = new String(address.getBytes("ISO-8859-1"),"utf-8");
204	204	return basicConfigService.getAddressItems(address);
205	205	}
	206	+
	207	+ @RequestMapping(value = "/getAddressName", method = RequestMethod.GET)
	208	+ @ResponseBody
	209	+ public String getAddressName(@RequestParam(required = true) String address) throws UnsupportedEncodingException {
	210	+ //address = new String(address.getBytes("ISO-8859-1"),"utf-8");
	211	+ return basicConfigService.getAddressName(address);
	212	+ }
206	213	}