Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+262
@@ -0,0 +1,262 @@
|
||||
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;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 地址治理
|
||||
*
|
||||
* @author shenjian
|
||||
* @since 2023/5/25
|
||||
*/
|
||||
@Authority(role = Role.USER)
|
||||
public class AddrSvcController {
|
||||
|
||||
/**
|
||||
* 地址结构化
|
||||
*
|
||||
* @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<String, String> params = new HashMap<String, String>();
|
||||
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 divisionAction(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<String, String> params = new HashMap<String, String>();
|
||||
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 completeAction(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<String, String> params = new HashMap<String, String>();
|
||||
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<String, String> params = new HashMap<String, String>();
|
||||
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<String, String> params = new HashMap<String, String>();
|
||||
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 suggestionAction(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<String, String> params = new HashMap<String, String>();
|
||||
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;
|
||||
}
|
||||
}
|
||||
+65
-13
@@ -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
|
||||
@@ -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<JSONObject> 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<JSONObject> 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<String, String> headers = new HashMap<String, String>();
|
||||
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<JSONObject> results = new ArrayList<JSONObject>();
|
||||
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;
|
||||
}
|
||||
|
||||
+50
@@ -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;
|
||||
}
|
||||
}
|
||||
+101
@@ -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;
|
||||
}
|
||||
}
|
||||
+128
@@ -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;
|
||||
}
|
||||
}
|
||||
+203
@@ -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;
|
||||
}
|
||||
}
|
||||
+191
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 通用实体与DTO互相转换工具类
|
||||
*
|
||||
* @author shenjian
|
||||
* @date 2021/06/16
|
||||
*/
|
||||
public class CommonDtoUtils {
|
||||
public static <T> T transformV(Class<T> 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 <T> List<T> transformListV(Class<T> 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
-3
@@ -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()
|
||||
|
||||
+26
@@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
@@ -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);
|
||||
|
||||
+18
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user