Merge remote-tracking branch 'origin/master'
This commit is contained in:
+3
-3
@@ -95,9 +95,9 @@ public class VillageIdentifyController {
|
||||
List<String> keys = Arrays.asList(
|
||||
"villageType", "cityParam", "address", "province", "provinceCode",
|
||||
"city1", "cityCode", "district", "districtCode", "town", "townCode",
|
||||
"committee", "committeeCode", "type", "typeCode", "verifyFlag", "addrVerify",
|
||||
"countyGov", "countyLevelCity", "administrativeTowns", "devDistrict",
|
||||
"devDistrictName", "devLevel", "addrArea"
|
||||
"committee", "committeeCode", "typeCode", "typeName", "verifyFlag", "addrVerify",
|
||||
"countyLevelCity", "administrativeTowns", "devDistrict",
|
||||
"devDistrictName", "devLevel", "countyGov", "addrArea"
|
||||
);
|
||||
|
||||
// 遍历keys list并从row中获取相应的值放入updata中
|
||||
|
||||
@@ -66,16 +66,16 @@
|
||||
<th>乡镇街道编码</th>
|
||||
<th>居委</th>
|
||||
<th>居委编码</th>
|
||||
<th>城乡属性</th>
|
||||
<th>城乡编码</th>
|
||||
<th>城乡分类</th>
|
||||
<th>涉农标识</th>
|
||||
<th>地址验证</th>
|
||||
<th>是否县政府</th>
|
||||
<th>是否县级市</th>
|
||||
<th>是否市辖建制镇</th>
|
||||
<th>是否开发区</th>
|
||||
<th>开发区名称</th>
|
||||
<th>开发区级别</th>
|
||||
<th>是否县政府</th>
|
||||
<th>所属区域</th>
|
||||
<th>时间</th>
|
||||
</tr>
|
||||
@@ -97,16 +97,16 @@
|
||||
<td>${it.townCode!}</td>
|
||||
<td>${it.committee!}</td>
|
||||
<td>${it.committeeCode!}</td>
|
||||
<td>${it.type!}</td>
|
||||
<td>${it.typeCdoe!}</td>
|
||||
<td>${it.typeCode!}</td>
|
||||
<td>${it.typeName!}</td>
|
||||
<td>${it.verifyFlag!}</td>
|
||||
<td>${it.addrVerify!}</td>
|
||||
<td>${it.countyGov!}</td>
|
||||
<td>${it.countyLevelCity!}</td>
|
||||
<td>${it.administrativeTowns!}</td>
|
||||
<td>${it.devDistrict!}</td>
|
||||
<td>${it.devDistrictName!}</td>
|
||||
<td>${it.devLevel!}</td>
|
||||
<td>${it.countyGov!}</td>
|
||||
<td>${it.addrArea!}</td>
|
||||
<td>${it.createTime?string("yyyy-MM-dd")}</td>
|
||||
</tr>
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService {
|
||||
}
|
||||
if (StringUtils.isNotBlank(city1)) {
|
||||
Pattern pattern = Pattern.compile(".*" + city1 + ".*");
|
||||
queryParams.add(new QueryParam("city1", pattern));
|
||||
queryParams.add(new QueryParam("cityParam", pattern));
|
||||
}
|
||||
if (StringUtils.isNotBlank(address)) {
|
||||
Pattern pattern = Pattern.compile(".*" + address + ".*");
|
||||
@@ -53,7 +53,7 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService {
|
||||
}
|
||||
if (StringUtils.isNotBlank(city1)) {
|
||||
Pattern pattern = Pattern.compile(".*" + city1 + ".*");
|
||||
queryParams.add(new QueryParam("city1", pattern));
|
||||
queryParams.add(new QueryParam("cityParam", pattern));
|
||||
}
|
||||
if (StringUtils.isNotBlank(address)) {
|
||||
Pattern pattern = Pattern.compile(".*" + address + ".*");
|
||||
|
||||
Reference in New Issue
Block a user