From e216f45965cc1c3df88bd6ea61cf52159bc81c70 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Thu, 25 May 2023 10:28:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressGovernanceController.java | 259 ++++++++++++++++++ .../dto/addressGovernance/DistrictDto.java | 50 ++++ .../DistrictIdentifyDto.java | 101 +++++++ .../addressGovernance/MatchedBuildingDto.java | 128 +++++++++ .../StructureAndCompleteDto.java | 203 ++++++++++++++ .../dto/addressGovernance/StructureDto.java | 191 +++++++++++++ .../com/fangjia/open/model/AddressModel.java | 21 +- .../com/fangjia/open/util/CommonDtoUtils.java | 41 +++ 8 files changed, 993 insertions(+), 1 deletion(-) create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java new file mode 100644 index 000000000..f7b63a250 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java @@ -0,0 +1,259 @@ +package com.fangjia.open.controllers; + +import com.fangjia.core.util.HttpRequest; +import com.fangjia.open.dto.addressGovernance.*; +import com.fangjia.open.model.AddesssMatchModel; +import com.fangjia.open.model.AddressModel; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.RestfulModelAndView; +import com.fangjia.open.util.CommonDtoUtils; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 地址治理 + * + * @author shenjian + * @since 2023/5/25 + */ +//@Authority(role = Role.USER) +public class AddressGovernanceController { + + /** + * 地址结构化 + * + * @param model + * @return + */ + public Object structureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure/v2", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(CommonDtoUtils.transformV(StructureDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 区划识别接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(CommonDtoUtils.transformV(DistrictIdentifyDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + + return mav; + } + + /** + * 地址补全 + */ + public Object structureAndCompleteAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(CommonDtoUtils.transformV(StructureAndCompleteDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址验证 + */ + public Object addrVerifyAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addrVerify", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址匹配 + */ + public Object matchAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("address", model.getAddress()); + params.put("category", model.getCategory()); + params.put("district", model.getSuggestDistrict()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + + return mav; + } + + /** + * 地址联想 + */ + public Object addressAssociationAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getKeyword())) { + mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("region", model.getRegion()); + params.put("keywords", model.getKeyword()); + params.put("page", "0"); + params.put("size", String.valueOf(model.getMax() == 0 ? 20 : (model.getMax() > 100 ? 100 : model.getMax()) )); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addressAssociation2", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(CommonDtoUtils.transformListV(DistrictDto.class, (JSONObject.fromObject(json.get("result"))).getJSONArray("content"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } catch(Exception e){ + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java new file mode 100644 index 000000000..cc71dcf21 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java @@ -0,0 +1,50 @@ +package com.fangjia.open.dto.addressGovernance; + +public class DistrictDto { + + private String province; + private String city; + private String region; + private String name; + private String address; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } +} \ No newline at end of file diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java new file mode 100644 index 000000000..03301c218 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java @@ -0,0 +1,101 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * 区划识别DTO + * + * @author shenjian + * @since 2023/5/25 + */ +public class DistrictIdentifyDto { + + private String province; + private String provinceCode; + private String city; + private String cityCode; + private String district; + private String districtCode; + private String township; + private String townshipCode; + private String community; + private String communityCode; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getDistrictCode() { + return districtCode; + } + + public void setDistrictCode(String districtCode) { + this.districtCode = districtCode; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getTownshipCode() { + return townshipCode; + } + + public void setTownshipCode(String townshipCode) { + this.townshipCode = townshipCode; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getCommunityCode() { + return communityCode; + } + + public void setCommunityCode(String communityCode) { + this.communityCode = communityCode; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java new file mode 100644 index 000000000..6568ae6bd --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java @@ -0,0 +1,128 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * 鍦板潃鍖归厤DTO + */ +public class MatchedBuildingDto { + + /** + * ID + */ + private String id; + /** + * 缃俊搴� + */ + private Double credit; + /** + * 鍩庡競 + */ + private String city; + /** + * 鍖哄煙 + */ + private String district; + /** + * 涔¢晣琛楅亾 + */ + private String township; + /** + * 寤虹瓚鐗╁悕绉� + */ + private String name; + /** + * 寤虹瓚鐗╁湴鍧� + */ + private String address; + /** + * 缁忓害(楂樺痉) + */ + private Double lng; + /** + * 绾害(楂樺痉) + */ + private Double lat; + /** + * 鐗╀笟绫诲瀷 + */ + private String propertyType; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Double getCredit() { + return credit; + } + + public void setCredit(Double credit) { + this.credit = credit; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java new file mode 100644 index 000000000..6407c8ce9 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java @@ -0,0 +1,203 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * 地址补全DTO + * + * @author shenjian + * @since 2023/5/25 + */ +public class StructureAndCompleteDto { + + /** + * 省份 + */ + private String province; + /** + * 城市 + */ + private String city; + /** + * 区域 + */ + private String district; + /** + * 开发区 + */ + private String dev; + /** + * 乡镇街道 + */ + private String township; + /** + * 道路 + */ + private String street; + /** + * 路号 + */ + private String streetNumber; + /** + * 居委村委 + */ + private String community; + /** + * 村组 + */ + private String group; + /** + * 名称 + */ + private String name; + /** + * 楼栋 + */ + private String buildingNumber; + /** + * 单元 + */ + private String unitNumber; + /** + * 楼层 + */ + private String floor; + /** + * 室号 + */ + private String roomNumber; + /** + * 格式化地址 + */ + private String formatAddress; + /** + * 地址验证 + */ + private String addrVerify; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBuildingNumber() { + return buildingNumber; + } + + public void setBuildingNumber(String buildingNumber) { + this.buildingNumber = buildingNumber; + } + + public String getUnitNumber() { + return unitNumber; + } + + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getFormatAddress() { + return formatAddress; + } + + public void setFormatAddress(String formatAddress) { + this.formatAddress = formatAddress; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java new file mode 100644 index 000000000..f2ca60475 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java @@ -0,0 +1,191 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * 地址结构化,请不要增加其他字段,与文档及地数输出一致 + * + * @author shenjian + * @since 2023/5/25 + */ +public class StructureDto { + + /** + * 省份 + */ + private String province; + /** + * 城市 + */ + private String city; + /** + * 区域 + */ + private String district; + /** + * 开发区 + */ + private String dev; + /** + * 乡镇街道 + */ + private String township; + /** + * 道路 + */ + private String street; + /** + * 路号 + */ + private String streetNumber; + /** + * 居委村委 + */ + private String community; + /** + * 村组 + */ + private String group; + /** + * 名称 + */ + private String name; + /** + * 楼栋 + */ + private String buildingNumber; + /** + * 单元 + */ + private String unitNumber; + /** + * 楼层 + */ + private String floor; + /** + * 室号 + */ + private String roomNumber; + /** + * 地址验证 + */ + private String addrVerify; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBuildingNumber() { + return buildingNumber; + } + + public void setBuildingNumber(String buildingNumber) { + this.buildingNumber = buildingNumber; + } + + public String getUnitNumber() { + return unitNumber; + } + + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java index 8c41c06ab..529d42d07 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java @@ -23,6 +23,7 @@ public class AddressModel extends FangjiaApiModel { private String preciseLevel; private String province; private String district; + private String region; private String chooseId; @@ -36,6 +37,9 @@ public class AddressModel extends FangjiaApiModel { private Integer pageNo; // 是否用于检查 private String dataLevel; + + private String keyword; + public boolean isContainsLocation() { return containsLocation; } @@ -228,5 +232,20 @@ public class AddressModel extends FangjiaApiModel { public void setDataLevel(String dataLevel) { this.dataLevel = dataLevel; } - + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java new file mode 100644 index 000000000..f324bc8f6 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java @@ -0,0 +1,41 @@ +package com.fangjia.open.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import java.util.List; + +/** + * 閫氱敤瀹炰綋涓嶥TO浜掔浉杞崲宸ュ叿绫� + * + * @author shenjian + * @date 2021/06/16 + */ +public class CommonDtoUtils { + public static T transformV(Class targetClass, Object source) { + if (source == null) { + return null; + } else { + try { + String jsonSource = JSON.toJSONString(source); + return JSONObject.parseObject(jsonSource, targetClass); + } catch (Exception var3) { + return null; + } + } + } + + public static List transformListV(Class targetClass, List listSource) { + if (listSource == null) { + return null; + } else { + try { + String jsonSource = JSON.toJSONString(listSource); + return JSONArray.parseArray(jsonSource, targetClass); + } catch (Exception var3) { + return null; + } + } + } +} \ No newline at end of file From 450d09217c10ac3429af229c8e4fd44959a0f18f Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Thu, 25 May 2023 14:35:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/AddressGovernanceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java index f7b63a250..98a343576 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java @@ -2,6 +2,8 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.HttpRequest; import com.fangjia.open.dto.addressGovernance.*; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; import com.fangjia.open.model.AddesssMatchModel; import com.fangjia.open.model.AddressModel; import com.fangjia.open.model.BasicModel; @@ -19,7 +21,7 @@ import java.util.Map; * @author shenjian * @since 2023/5/25 */ -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class AddressGovernanceController { /** From 4a5e3020070f06d07c3f8a817bc954d67252dca2 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Thu, 25 May 2023 14:42:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addressGovernance/MatchedBuildingDto.java | 20 +++++++++---------- .../com/fangjia/open/util/CommonDtoUtils.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java index 6568ae6bd..e666a9100 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java @@ -1,7 +1,7 @@ package com.fangjia.open.dto.addressGovernance; /** - * 鍦板潃鍖归厤DTO + * 地址匹配DTO */ public class MatchedBuildingDto { @@ -10,39 +10,39 @@ public class MatchedBuildingDto { */ private String id; /** - * 缃俊搴� + * 置信度 */ private Double credit; /** - * 鍩庡競 + * 城市 */ private String city; /** - * 鍖哄煙 + * 区域 */ private String district; /** - * 涔¢晣琛楅亾 + * 乡镇街道 */ private String township; /** - * 寤虹瓚鐗╁悕绉� + * 建筑物名称 */ private String name; /** - * 寤虹瓚鐗╁湴鍧� + * 建筑物地址 */ private String address; /** - * 缁忓害(楂樺痉) + * 经度(高德) */ private Double lng; /** - * 绾害(楂樺痉) + * 纬度(高德) */ private Double lat; /** - * 鐗╀笟绫诲瀷 + * 物业类型 */ private String propertyType; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java index f324bc8f6..bebd942e0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject; import java.util.List; /** - * 閫氱敤瀹炰綋涓嶥TO浜掔浉杞崲宸ュ叿绫� + * 通用实体与DTO互相转换工具类 * * @author shenjian * @date 2021/06/16 From ffe2c8a8a3e178ff7c8abfc455f615265c8601b8 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Fri, 26 May 2023 11:35:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sGovernanceController.java => AddrSvcController.java} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename projects/fangjia-open/src/main/java/com/fangjia/open/controllers/{AddressGovernanceController.java => AddrSvcController.java} (97%) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java similarity index 97% rename from projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java rename to projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 98a343576..d17fb74f3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressGovernanceController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -11,6 +11,7 @@ import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.open.util.CommonDtoUtils; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Controller; import java.util.HashMap; import java.util.Map; @@ -22,7 +23,7 @@ import java.util.Map; * @since 2023/5/25 */ @Authority(role = Role.USER) -public class AddressGovernanceController { +public class AddrSvcController { /** * 地址结构化 @@ -69,7 +70,7 @@ public class AddressGovernanceController { * @param model * @return */ - public Object fiveDivisionStructureAction(AddesssMatchModel model) { + public Object divisionAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -107,7 +108,7 @@ public class AddressGovernanceController { /** * 地址补全 */ - public Object structureAndCompleteAction(AddesssMatchModel model) { + public Object completeAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -219,7 +220,7 @@ public class AddressGovernanceController { /** * 地址联想 */ - public Object addressAssociationAction(AddressModel model) { + public Object suggestionAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getCity())) { From beeec6607bfac9bfae0b1662b31f1252de558eb4 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 26 May 2023 18:37:10 +0800 Subject: [PATCH 5/7] update --- .../ccbevaluation/CcbCommonUtils.groovy | 13 +++++++--- .../script/commData/CommonDatautils.groovy | 26 +++++++++++++++++++ .../script/jiangnanblank/CZDataBatch.groovy | 1 + .../script/jiangnanblank/FzDataUtils.groovy | 18 +++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index d0a216521..465eac28c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -218,6 +218,7 @@ class CcbCommonUtils { q.put("avg_price", new BasicDBObject('$gt', 0)) q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) q.put("match_id", dist._id.toString()) + q.put("type", new BasicDBObject('$ne','车位')) def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() @@ -445,12 +446,17 @@ class CcbCommonUtils { def dbsour = DBUtils.seaweed.find(q,keys).batchSize(2000) println "[${city}] 原始:"+dbsour.count() def rets = [] + + def ids = [] for(def d : dbsour){ if(d.name_cat == 0 && d.lng && ["普通住宅","商住"].contains(d.estate_type2) && !d.name.contains("洋房") && !d.name.contains("公房")){ if(d.address){ d.address = d.address.replaceAll("\r|\n|\\s", ""); } - rets << d + if(!ids.contains(d._id.toString())){ + ids << d._id.toString() + rets << d + } } } println "[${city}] 小区量:"+rets.size() @@ -606,11 +612,12 @@ class CcbCommonUtils { - public static def findTradesByMonth(city, startDate, endDate){ + public static def findTradesByMonth(city, startDate){ def q = new BasicDBObject() q.put("city", city) - q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) + q.put("trade_date", new BasicDBObject('$gte', startDate)) q.put("match_id", new BasicDBObject('$exists', false)) +// q.put("district_name","国贸天琴湾") def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index b7bf2feb6..543973cfa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -71,6 +71,7 @@ class CommonDatautils { public static final DBCollection LOUDONG_LINE_COLL = MongoUtils.getCollectionByName2("fangjia_base", "loudong", mongoDbUrl) public static final DBCollection HOUSE_LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", mongoDbUrl) public static final DBCollection CITY_INFO_COLL = MongoUtils.getCollectionByName2("fangjia_data_ana", "city_info", mongoDbUrl) + public static final DBCollection REGION_INFO_CONN = MongoUtils.getCollectionByName("fangjia_data_ana", "region_info", MongoUtils.MongoDB_Domain_mongo); public static DSCollection getHouseDataStoreConnection(){ if(house_dataStoreConnection != null) { @@ -2989,6 +2990,19 @@ class CommonDatautils { } return names; } + + + public static def getCityByRegion(region){ + DBObject q = new BasicDBObject(); + q.put("category", "region"); + q.put("name", region); + def cursor = REGION_BLOCK_COLL.find(q); + def citys = []; + for(def obj : cursor){ + citys << obj.city; + } + return citys; + } static def findBusLineCount(def city, def maxLat, def minLat, def maxLng, def minLng){ DBObject q = new BasicDBObject() @@ -3464,5 +3478,17 @@ class CommonDatautils { } return null } + + static def findRegionPriceRate(city, region){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + def cur = REGION_INFO_CONN.find(q).sort(new BasicDBObject("weekend", -1)).limit(1) + def obj = null + while(cur.hasNext()) { + obj = cur.next() + } + return obj + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy index d55d98dc4..ced116b61 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy @@ -59,6 +59,7 @@ class CZDataBatch extends BaseBatch{ def districts = converList(CommonDatautils.findAllDistricts(city, "district", fields)); districtRun(districts, statMap, commids); + FzDataUtils.removeNoUpdate(city, districts) def shops = CommonDatautils.findAllDistricts(city, "shop", fields); shops = mergeShop(shops); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy index 8a9325c9b..bf6e2c177 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy @@ -101,6 +101,23 @@ class FzDataUtils { saveDistrict(map); } + static def removeNoUpdate(city, districts){ + def ids = [] + for(def d : districts){ + ids << d._id.toString() + } + DBObject q = new BasicDBObject(); + q.put("city", city) + q.put("cat", "district") + def dbcursor = DIST_COLL.find(q) + for(def cur : dbcursor){ + if(!ids.contains(cur.num_id)){ + def del_data = new BasicDBObject() + del_data.put("num_id", cur.num_id) + DIST_COLL.remove(del_data) + } + } + } static def saveDistrict(def m){ DBObject q = new BasicDBObject(); @@ -111,6 +128,7 @@ class FzDataUtils { m.each {k,v-> udata.put(k, v); } + udata.put("m_date", new Date()) if(dbo){ udata.removeField("num_id") DIST_COLL.update(q, new BasicDBObject('$set', udata), false, true); From 532503a7e345e0a266f2b8ec19cd63756c2c9feb Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Mon, 29 May 2023 11:09:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=99=E5=95=86?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 82 +++++++++++++++---- 1 file changed, 67 insertions(+), 15 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 3b9563cbe..ad2c3adbd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -87,7 +87,7 @@ import com.fangjia.service.open.WaitCrawlKeywordsService; import com.fangjia.service.sql.FjtEvaluationService; import com.fangjia.service.web.AddressService; -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class AddressController { private AddressService addressService; @@ -985,6 +985,14 @@ public class AddressController { return term; } + private JSONObject addMatchPhrase(String name, String value){ + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put(name, value); + term.put("match_phrase", match); + return term; + } + /*** * 获取自然村 * @param city @@ -3279,7 +3287,7 @@ public class AddressController { return mav; } - @Authority(role = Role.USER) + //@Authority(role = Role.USER) public Object riskAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); // if (StringUtils.isEmpty(model.getCity())) { @@ -3322,20 +3330,26 @@ public class AddressController { searchKey.append(searchAddress.getString("streetNumber")); } if (StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))) { - JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress()); - JSONArray poisData = jsonObject.getJSONArray("pois"); - for (int i = 0; i < poisData.size(); i++) { - String address = poisData.getJSONObject(i).getString("address"); - if (address.contains(searchKey.toString())) { - resultMap.put("riskLevel", "A"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } else { - continue; - } +// JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress()); +// JSONArray poisData = jsonObject.getJSONArray("pois"); +// for (int i = 0; i < poisData.size(); i++) { +// String address = poisData.getJSONObject(i).getString("address"); +// if (address.contains(searchKey.toString())) { +// resultMap.put("riskLevel", "A"); +// resultModel.setResult(resultMap); +// mav.setModel(resultModel); +// return mav; +// } else { +// continue; +// } +// } + String city = searchAddress.getString("city"); + List poiList = this.findPois(city, searchKey.toString()); + if (CollectionUtils.isNotEmpty(poiList)) { + resultMap.put("riskLevel", "A"); + } else { + resultMap.put("riskLevel", "B"); } - resultMap.put("riskLevel", "B"); resultModel.setResult(resultMap); mav.setModel(resultModel); return mav; @@ -3352,6 +3366,44 @@ public class AddressController { return mav; } + private List findPois(String city, String address) { + JSONObject reqBody = new JSONObject(); + reqBody.put("from", 0); + reqBody.put("size", 1); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerm("city", city)); + must.add(addMatchPhrase("address", address)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString((""+ES_USER+":"+ES_PASSWORD+"").getBytes()); + HttpRequest request = new HttpRequest(); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic "+authenticationEncoding+""); + try { + String response = request.postWithBody("http://192.168.0.45:9200/association/_search", reqBody, headers, "UTF-8"); + JSONObject json = JSONObject.fromObject(response); + if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ + return Collections.emptyList(); + } + JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); + List results = new ArrayList(); + for(int i=0 ;i < hits.size(); i++){ + JSONObject jsonObject = hits.getJSONObject(i); + results.add(jsonObject); + } + return results; + + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + public void setAddressService(AddressService addressService) { this.addressService = addressService; } From 28e2ca8a06dfd8fe2ab73da8af54c47f56f6f297 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Mon, 29 May 2023 11:18:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=99=E5=95=86?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index ad2c3adbd..0a2cc8803 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -87,7 +87,7 @@ import com.fangjia.service.open.WaitCrawlKeywordsService; import com.fangjia.service.sql.FjtEvaluationService; import com.fangjia.service.web.AddressService; -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class AddressController { private AddressService addressService; @@ -3287,7 +3287,7 @@ public class AddressController { return mav; } - //@Authority(role = Role.USER) + @Authority(role = Role.USER) public Object riskAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); // if (StringUtils.isEmpty(model.getCity())) {