From 01b27ce1de3aac5d452fb274e67b892428141219 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Wed, 24 Apr 2024 01:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E9=93=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index a12b7d38d..451f7c425 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -380,17 +380,16 @@ public class AddrSvcController { private static final Map areaMap = new HashMap() { { // 添加键值对到 Map 中 - areaMap.put("111", "主城区"); - areaMap.put("112", "城乡结合区"); - areaMap.put("121", "镇中心区"); - areaMap.put("122", "镇乡结合区"); - areaMap.put("123", "特殊区域"); - areaMap.put("210", "村庄"); + put("111", "主城区"); + put("112", "城乡结合区"); + put("121", "镇中心区"); + put("122", "镇乡结合区"); + put("123", "特殊区域"); + put("210", "村庄"); } }; - /** * 涉农识别-新规则-南京银行 * @@ -444,19 +443,22 @@ public class AddrSvcController { String qltype = "2".equals(type) ? "1" : "0"; Map map = senRequest(address, qltype); // 如果涉农结果不一样,用齐梁结果 - if (!("0".equals(map.get("farmer")) && "非农".equals(result.get("verifyFlag")))||!("1".equals(map.get("farmer")) && "农".equals(result.get("verifyFlag")))){ + if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { map.put("addrVerify", result.getString("addrVerify")); - map.put("typeName",areaMap.get(map.get("typeCode"))); + map.put("typeName", areaMap.get(map.get("typeCode"))); + basicModel.setResult(map); + } else { + basicModel.setResult(result); } - basicModel.setResult(map); - }else { + } else { basicModel.setResult(result); } } catch (Exception e) { e.printStackTrace(); + basicModel.setResult(result); } } mav.setModel(basicModel); @@ -528,26 +530,30 @@ public class AddrSvcController { // dataMap.put("code", jsonObject.get("code").getAsString()); // dataMap.put("msg", jsonObject.get("msg").getAsString()); JsonObject data = jsonObject.getAsJsonObject("data"); + if (data != null && !data.isJsonNull()) { + // dataMap.put("version", data.get("version").getAsString()); - dataMap.put("province", data.get("province").getAsString()); - dataMap.put("city", data.get("city").getAsString()); - dataMap.put("district", data.get("district").getAsString()); - dataMap.put("town", data.get("town").getAsString()); - dataMap.put("committee", data.get("village").getAsString()); - dataMap.put("provinceCode", data.get("provinceCode").getAsString()); - dataMap.put("cityCode", data.get("cityCode").getAsString()); - dataMap.put("districtCode", data.get("districtCode").getAsString()); - dataMap.put("townCode", data.get("townCode").getAsString()); - dataMap.put("committeeCode", data.get("villageCode").getAsString()); - dataMap.put("typeCode", data.get("areaCode").getAsString()); - dataMap.put("verifyFlag", "0".equals(data.get("farmer").getAsString())?"非农":"农"); - dataMap.put("countyGov", "0".equals(data.get("isGovt").getAsString())?"否":"是"); + dataMap.put("province", data.get("province").getAsString()); + dataMap.put("city", data.get("city").getAsString()); + dataMap.put("district", data.get("district").getAsString()); + dataMap.put("town", data.get("town").getAsString()); + dataMap.put("committee", data.get("village").getAsString()); + dataMap.put("provinceCode", data.get("provinceCode").getAsString()); + dataMap.put("cityCode", data.get("cityCode").getAsString()); + dataMap.put("districtCode", data.get("districtCode").getAsString()); + dataMap.put("townCode", data.get("townCode").getAsString()); + dataMap.put("committeeCode", data.get("villageCode").getAsString()); + dataMap.put("typeCode", data.get("areaCode").getAsString()); + dataMap.put("verifyFlag", "0".equals(data.get("farmer").getAsString()) ? "非农" : "农"); + dataMap.put("countyGov", "0".equals(data.get("isGovt").getAsString()) ? "否" : "是"); // dataMap.put("govtAddr", data.get("govtAddr").isJsonNull() ? null : data.get("govtAddr").getAsString()); // 对于可能为 null 的值,需要判断是否为空 - JsonArray indusParkList = data.get("indusParkList").isJsonNull() ? null : data.get("indusParkList").getAsJsonArray(); - if (indusParkList != null) { - JsonObject jsonObject1 = gson.fromJson(indusParkList.get(0), JsonObject.class); - dataMap.put("devDistrictName", jsonObject1.get("indusParkName").getAsString()); - dataMap.put("devDistrict", "是"); + JsonArray indusParkList = data.get("indusParkList").isJsonNull() ? null : data.get("indusParkList").getAsJsonArray(); + + if (indusParkList != null) { + JsonObject jsonObject1 = gson.fromJson(indusParkList.get(0), JsonObject.class); + dataMap.put("devDistrictName", jsonObject1.get("indusParkName").getAsString()); + dataMap.put("devDistrict", "是"); + } } httpResponse.close();