This commit is contained in:
沈健
2024-08-19 13:22:37 +08:00
parent 431cebb977
commit 6faa15235d
@@ -467,11 +467,15 @@ public class AddrSvcController {
} else {
map.put("addrVerify", "地址有效");
map.put("typeName", areaMap.get(map.get("typeCode")));
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
basicModel.setResult(map);
}
} else {
map.put("addrVerify", "地址有效");
map.put("typeName", areaMap.get(map.get("typeCode")));
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
basicModel.setResult(map);
}
@@ -498,6 +502,45 @@ public class AddrSvcController {
}
return mav;
}
/**
* 判断县级市
*/
public String countyLevelCity(Map<String, String> map) {
if (map.get("city") == null) {
return "";
}
if (map.get("city").endsWith("区")) {
return "否";
}
if (map.get("city").equals("东莞市") || map.get("city").equals("嘉峪关市") || map.get("city").equals("中山市") || map.get("city").equals("儋州市") ) {
return "否";
}
return "是";
}
/**
* 判断所属区域
*
* @param map
* @return
*/
public String addrArea(Map<String, String> map, String type) {
if (map.get("verifyFlag") == null ) {
return "";
}
if (map.get("verifyFlag").equals("非农")) {
return "城市区域";
}
if (map.get("verifyFlag").equals("农")) {
return "农村区域";
}
if ("2".equals(type) && "是".equals(map.get("countyGov"))) {
return "县城城区";
}
return "";
}
/**
* 涉农识别-新规则-上海征信
*
@@ -565,11 +608,15 @@ public class AddrSvcController {
basicModel.setResult(result);
} else {
map.put("addrVerify", "地址有效");
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
map.put("typeName", areaMap.get(map.get("typeCode")));
basicModel.setResult(map);
}
} else {
map.put("addrVerify", "地址有效");
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
map.put("typeName", areaMap.get(map.get("typeCode")));
basicModel.setResult(map);
}
@@ -703,11 +750,15 @@ public class AddrSvcController {
basicModel.setResult(result);
} else {
map.put("addrVerify", "地址有效");
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
map.put("typeName", areaMap.get(map.get("typeCode")));
basicModel.setResult(map);
}
} else {
map.put("addrVerify", "地址有效");
map.put("addrArea", addrArea(map, type));
map.put("countyLevelCity", countyLevelCity(map));
map.put("typeName", areaMap.get(map.get("typeCode")));
basicModel.setResult(map);
}