From 668e5ec5dac21528a9bacda94c5d8c271f70c058 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Tue, 8 Nov 2022 17:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B6=88=E8=B4=B9=E8=AF=84?= =?UTF-8?q?=E7=BA=A7=E3=80=81=E6=A5=BC=E7=9B=98=E8=AF=84=E7=BA=A7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 163 +++++++++++++++++- .../model/CommunitySummaryRequestDto.java | 89 ++++++++++ 2 files changed, 247 insertions(+), 5 deletions(-) create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java 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 af890d880..2ae672241 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 @@ -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 headers = new HashMap(); + 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 headers = new HashMap(); + 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 headers = new HashMap(); + 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())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java new file mode 100644 index 000000000..6c5cdd50d --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java @@ -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; + } +}