From abb48918110efec168b55b7d43d0367894bd6ac8 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Mon, 4 Aug 2025 15:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=97=E4=BA=AC=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E5=AF=B9=E7=A7=81=E6=B6=89=E5=86=9C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/dal/mongo/model/Township.java | 10 +++++ .../open/controllers/AddrSvcController.java | 40 ++++++++++++++++++- .../mongo/fangjia/TownshipService.java | 3 ++ .../mongo/fangjia/TownshipServiceImpl.java | 7 ++++ 4 files changed, 59 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java index ea8f98f6a..7f302cd8c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java @@ -19,6 +19,7 @@ public class Township implements MongoEntity { private String street; private String pid; private String id; + private String hasGov; @JSONField(name = "tjj_province_code") private String tjjProvinceCode; @@ -325,4 +326,13 @@ public class Township implements MongoEntity { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + @Column(name = "has_gov") + public String getHasGov() { + return hasGov; + } + + public void setHasGov(String hasGov) { + this.hasGov = hasGov; + } } 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 b2a850189..d821d7171 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 @@ -3,9 +3,11 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.HttpRequest; import com.fangjia.dal.mongo.model.DistrictAnalyData; +import com.fangjia.dal.mongo.model.Township; import com.fangjia.dal.mongo.model.VillageIdentify; import com.fangjia.dal.seaweed.model.District; import com.fangjia.open.APIConstant; +import com.fangjia.open.FangjiaApiUtil; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.DistrictDto; import com.fangjia.open.dto.addressGovernance.DistrictIdentifyDto; @@ -21,6 +23,7 @@ import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.service.bo.DistrictAvgBo; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.district.DistrictStatService; +import com.fangjia.service.mongo.fangjia.TownshipService; import com.fangjia.service.mongo.fangjia.VillageIdentifyService; import com.fangjia.service.open.DistrictAnalyDataService; import com.google.gson.Gson; @@ -63,6 +66,7 @@ public class AddrSvcController { private DistrictService districtService; private VillageIdentifyService villageIdentifyService; private DistrictAnalyDataService districtAnalyDataService; + private TownshipService townshipService; /** * 地址结构化 @@ -972,7 +976,6 @@ public class AddrSvcController { ex.printStackTrace(); } } - if (json != null) { int code = json.getInt("msgCode"); String msg = json.getString("msg"); @@ -980,6 +983,37 @@ public class AddrSvcController { if (json.containsKey("result")) { //我们的结果 JSONObject result = json.getJSONObject("result"); + String userId = FangjiaApiUtil.parseUserId(model.getToken()); + if("对私".equals(villageType) && ("1007801".equals(userId) || "1007497".equals(userId))){ + result.remove("verifyFlag"); + if(result.containsKey("district")){ + String district = result.getString("district"); + if(district != null){ + if(district.endsWith("区")){ + result.put("verifyFlag", "非农"); + }else if(result.containsKey("countyGov") && StringUtils.isNotBlank(result.getString("countyGov"))){ + String countyGov = result.getString("countyGov"); + if("是".equals(countyGov)){ + result.put("verifyFlag", "非农"); + } else if ("否".equals(countyGov)) { + result.put("verifyFlag", "农"); + } + }else if(result.containsKey("townCode")){ + String townCode = result.getString("townCode"); + Township township = townshipService.findTownshipByCode(townCode); + if(township != null){ + String countyGov = "是".equals(township.getHasGov())?"是":"否"; + result.put("countyGov", countyGov); + if("是".equals(countyGov)){ + result.put("verifyFlag", "非农"); + } else { + result.put("verifyFlag", "农"); + } + } + } + } + } + } basicModel.setResult(result); } mav.setModel(basicModel); @@ -1788,4 +1822,8 @@ public class AddrSvcController { public void setDistrictAnalyDataService(DistrictAnalyDataService districtAnalyDataService) { this.districtAnalyDataService = districtAnalyDataService; } + + public void setTownshipService(TownshipService townshipService) { + this.townshipService = townshipService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java index 476b69aca..55b1672ba 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java @@ -46,4 +46,7 @@ public interface TownshipService { */ public Township findTownship(String id); + + public Township findTownshipByCode(String code); + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java index 9cb6373d6..884d03c06 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java @@ -87,6 +87,13 @@ public class TownshipServiceImpl implements TownshipService { return townshipDao.findById(id); } + @Override + public Township findTownshipByCode(String streetCode) { + List params = new ArrayList(); + params.add(new QueryParam("tjjStreetCode", streetCode)); + return townshipDao.findFirstByParams( params); + } + public void setTownshipDao(TownshipDao townshipDao) { this.townshipDao = townshipDao; }