Merge branch 'open_gj' into 'master'

新增地址分类接口、消费评级、楼盘评级接口

See merge request !428
This commit is contained in:
2022-11-08 18:24:05 +08:00
2 changed files with 247 additions and 5 deletions
@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
import javax.validation.Valid;
import com.fangjia.core.util.*;
import com.fangjia.open.model.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -54,11 +55,6 @@ import com.fangjia.open.OpenConfig;
import com.fangjia.open.dto.UniversalDto;
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.RateModel;
import com.fangjia.open.model.RestfulModelAndView;
import com.fangjia.service.address.AddressParser;
import com.fangjia.service.address.AddressParserService;
import com.fangjia.service.address.AddressParserUtil;
@@ -1931,6 +1927,163 @@ public class AddressController {
return mav;
}
/**
* 地址信息分类接口
* @param model
* @return
*/
public Object communitySummaryAction(CommunitySummaryRequestDto model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress())) {
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
return mav;
}
HttpRequest request = new HttpRequest();
JSONObject json = null;
try{
Map<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/json");
JSONObject reqBody = new JSONObject();
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
reqBody.put("address", model.getAddress());
reqBody.put("area", model.getArea());
reqBody.put("maxFloor", model.getMaxFloor());
reqBody.put("housePurpose", model.getHousePurpose());
reqBody.put("memo", model.getMemo());
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody ,headers, "UTF-8");
if(result != null){
try{
json = JSONObject.fromObject(result);
} catch(Exception e){
json = null;
}
}
} catch(Exception e){
e.printStackTrace();
}
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("服务升级中..."));
}
return mav;
}
/**
* 楼盘评级
* @param model
* @return
*/
public Object buildingRatingAction(CommunitySummaryRequestDto model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress())) {
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
return mav;
}
HttpRequest request = new HttpRequest();
JSONObject json = null;
try{
Map<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/json");
JSONObject reqBody = new JSONObject();
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
reqBody.put("address", model.getAddress());
reqBody.put("area", model.getArea());
reqBody.put("maxFloor", model.getMaxFloor());
reqBody.put("housePurpose", model.getHousePurpose());
reqBody.put("memo", model.getMemo());
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8");
if(result != null){
try{
json = JSONObject.fromObject(result);
} catch(Exception e){
json = null;
}
}
} catch(Exception e){
e.printStackTrace();
}
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("服务升级中..."));
}
return mav;
}
/**
* 财力评级
* @param model
* @return
*/
public Object financialRatingAction(CommunitySummaryRequestDto model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress())) {
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
return mav;
}
HttpRequest request = new HttpRequest();
JSONObject json = null;
try{
Map<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/json");
JSONObject reqBody = new JSONObject();
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
reqBody.put("address", model.getAddress());
reqBody.put("area", model.getArea());
reqBody.put("maxFloor", model.getMaxFloor());
reqBody.put("housePurpose", model.getHousePurpose());
reqBody.put("memo", model.getMemo());
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers,"UTF-8");
if(result != null){
try{
json = JSONObject.fromObject(result);
} catch(Exception e){
json = null;
}
}
} catch(Exception e){
e.printStackTrace();
}
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("服务升级中..."));
}
return mav;
}
public Object similarityAction(AddesssMatchModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) {
@@ -0,0 +1,89 @@
package com.fangjia.open.model;
/**
* 小区宽表入参DTO
*
* @author shenjian
* @since 2022/10/11
*/
public class CommunitySummaryRequestDto extends FangjiaApiModel {
/**
* 城市
*/
private String city;
/**
* 地址
*/
private String address;
/**
* 总楼层
*/
private Integer maxFloor;
/**
* 面积
*/
private Float area;
/**
* 房屋用途
*/
private String housePurpose;
/**
* 备注
*/
private String memo;
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Integer getMaxFloor() {
return maxFloor;
}
public void setMaxFloor(Integer maxFloor) {
this.maxFloor = maxFloor;
}
public Float getArea() {
return area;
}
public void setArea(Float area) {
this.area = area;
}
public String getHousePurpose() {
return housePurpose;
}
public void setHousePurpose(String housePurpose) {
this.housePurpose = housePurpose;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
}