diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 981015511..91d7f9a01 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -13,11 +13,9 @@ import com.fangjia.open.dto.DistrictInfoDto; import com.fangjia.open.interceptors.AuthenticationBean; import com.fangjia.open.interceptors.Authority; import com.fangjia.open.interceptors.Role; -import com.fangjia.open.model.BasicModel; -import com.fangjia.open.model.PropertyEvaluationModel; -import com.fangjia.open.model.PropertySearchModel; -import com.fangjia.open.model.RestfulModelAndView; +import com.fangjia.open.model.*; import com.fangjia.open.util.CommonUtils; +import com.fangjia.open.util.FangJiaTongUrl; import com.fangjia.service.address.AddressParser; import com.fangjia.service.api.AddressMatchProxyService; import com.fangjia.service.datastore.DistrictService; @@ -543,6 +541,144 @@ public class OfficeController { } } + /** + * 申请估值报告 + * + * @param model 申请报告请求参数 + * @return + */ + public Object assessPriceReportApplyAction(ReportApplyModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(model.getClient())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:委托机构为必填项")); + return mav; + } + if (StringUtils.isBlank(model.getSubjectMatter())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:标的物为必填项")); + return mav; + } + if (StringUtils.isBlank(model.getCity()) || model.getCity().contains("全国")) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市为必填项且不能为全国")); + return mav; + } + if (StringUtils.isBlank(model.getDistrict()) || model.getDistrict().contains("全国")) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域为必填项且不能为全国")); + return mav; + } + if (model.getSize() == null || model.getSize() <= 0 ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积(size)为必填项且大于0")); + return mav; + } + if (model.getCity().endsWith("市")) { + model.setCity(model.getCity().replaceAll("市$", "")); + } + if (model.getDistrict().endsWith("区")) { + model.setDistrict(model.getDistrict().replaceAll("区$", "")); + } + if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + return mav; + } + if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + return mav; + } + if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { + mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + return mav; + } + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("client", model.getClient()); + params.put("subjectMatter", model.getSubjectMatter()); + params.put("city", model.getCity()); + params.put("address", StringUtils.isNotBlank(model.getAddress()) ? model.getAddress() : null); + params.put("district", model.getDistrict()); + params.put("name", StringUtils.isNotBlank(model.getName()) ? model.getName() : null); + params.put("houseNum", StringUtils.isNotBlank(model.getBuildingNumber()) ? model.getBuildingNumber() : null); + params.put("roomNum", StringUtils.isNotBlank(model.getUnitNumber()) ? model.getUnitNumber() : null); + params.put("size", String.valueOf(model.getSize())); + params.put("houseFloor", model.getFloor() != null ? String.valueOf(model.getFloor()) : null); + params.put("houseHeight", model.getMaxFloor() != null ? String.valueOf(model.getMaxFloor()) : null); + params.put("buildType", StringUtils.isNotBlank(model.getPropertyType()) ? model.getPropertyType() : "0"); + params.put("direction", StringUtils.isNotBlank(model.getDirection()) ? model.getDirection() : "3"); + params.put("fitment", StringUtils.isNotBlank(model.getDecoration()) ? model.getDecoration() : "2"); + JSONObject jsonObject = JSONObject.fromObject(params); + Map headers = new HashMap(); + headers.put("Authorization", "Bearer " + FangJiaTongUrl.FANG_JIA_TONG_TOKEN); + headers.put("Content-Type", "application/json"); + try { + String ret = request.postWithBody(FangJiaTongUrl.FANG_JIA_TONG_URL_UAT + FangJiaTongUrl.ASSESS_PRICE_REPORT_APPLY, jsonObject, headers, "UTF-8"); + json = JSONObject.fromObject(FangJiaTongUrl.replaceAll(ret)); + } catch (Exception e) { + try { + String ret = request.postWithBody(FangJiaTongUrl.FANG_JIA_TONG_URL_UAT + FangJiaTongUrl.ASSESS_PRICE_REPORT_APPLY, jsonObject, headers, "UTF-8"); + json = JSONObject.fromObject(FangJiaTongUrl.replaceAll(ret)); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + if (json != null) { + if (json.getInt("code") == 200 && json.containsKey("data")) { + HashMap result = new HashMap(); + result.put("caseId", String.valueOf(json.get("data"))); + mav.setModel(BasicModel.buildOKModel().setResult(result)); + } else { + mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:" + json.getString("message"))); + } + } else { + mav.setModel(BasicModel.buildBadRequestModel("申请估值报告失败:调用申请报告接口返回为空")); + } + return mav; + } + + /** + * 获取估值报告 + * + * @param caseId 估值报告ID + * @return + */ + public Object assessPriceReportFetchAction(@Param(name = "caseId") String caseId) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(caseId)) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:估值报告业务编号为必填项")); + return mav; + } + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("caseId", caseId); + JSONObject jsonObject = JSONObject.fromObject(params); + Map headers = new HashMap(); + headers.put("Authorization", "Bearer " + FangJiaTongUrl.FANG_JIA_TONG_TOKEN); + headers.put("Content-Type", "application/json"); + try { + String ret = request.postWithBody(FangJiaTongUrl.FANG_JIA_TONG_URL_UAT + FangJiaTongUrl.ASSESS_PRICE_REPORT_FETCH, jsonObject, headers, "UTF-8"); + json = JSONObject.fromObject(FangJiaTongUrl.replaceAll(ret)); + } catch (Exception e) { + try { + String ret = request.postWithBody(FangJiaTongUrl.FANG_JIA_TONG_URL_UAT + FangJiaTongUrl.ASSESS_PRICE_REPORT_FETCH, jsonObject, headers, "UTF-8"); + json = JSONObject.fromObject(FangJiaTongUrl.replaceAll(ret)); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + if (json != null) { + if (json.getInt("code") == 200 && json.containsKey("data")) { + JSONObject resultJson = json.getJSONObject("data"); + mav.setModel(BasicModel.buildOKModel().setResult(resultJson)); + } else { + mav.setModel(BasicModel.buildBadRequestModel("获取估值报告失败:" + json.getString("message"))); + } + } else { + mav.setModel(BasicModel.buildBadRequestModel("申请报告失败:调用获取估值报告接口返回为空")); + } + return mav; + } + private Integer getFloor(String roomNumber) { if (StringUtils.isNotBlank(roomNumber) && DataUtil.isNumber(roomNumber)) { if (roomNumber.length() == 3) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java new file mode 100644 index 000000000..89cbcfbea --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ReportApplyModel.java @@ -0,0 +1,174 @@ +package com.fangjia.open.model; + +public class ReportApplyModel extends FangjiaApiModel { + + /** + * 委托机构 + */ + private String client; + /** + * 标的物 + */ + private String subjectMatter; + /** + * 标的物所在城市 + */ + private String city; + /** + * 标的物地址 + */ + private String address; + /** + * 标的物区域 + */ + private String district; + /** + * 标的物小区名称 + */ + private String name; + /** + * 楼号 + */ + private String buildingNumber; + /** + * 室号 + */ + private String unitNumber; + /** + * 面积,单位:平米 + */ + private Float size; + /** + * 所在楼层 + */ + private Integer floor; + /** + * 总楼层 + */ + private Integer maxFloor; + /** + * 物业类型 取值为: 0=普通住宅(默认) 1=别墅 2=商住 + */ + private String propertyType; + /** + * 朝向,可选值有: 1=西南 2=东南 3=南(默认) 4=西北 5=东北 6=东 7=西 8=北 9=东西 10=南北 + */ + private String direction; + /** + * 装修情况,可选值有: 1=毛坯 2=简装(默认) 3=精装 4=豪装 + */ + private String decoration; + + public String getClient() { + return client; + } + + public void setClient(String client) { + this.client = client; + } + + public String getSubjectMatter() { + return subjectMatter; + } + + public void setSubjectMatter(String subjectMatter) { + this.subjectMatter = subjectMatter; + } + + 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 String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + 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 Float getSize() { + return size; + } + + public void setSize(Float size) { + this.size = size; + } + + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + public Integer getMaxFloor() { + return maxFloor; + } + + public void setMaxFloor(Integer maxFloor) { + this.maxFloor = maxFloor; + } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getDecoration() { + return decoration; + } + + public void setDecoration(String decoration) { + this.decoration = decoration; + } + +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java new file mode 100644 index 000000000..47d8fa603 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FangJiaTongUrl.java @@ -0,0 +1,47 @@ +package com.fangjia.open.util; + +import org.apache.commons.lang.StringUtils; + +public class FangJiaTongUrl { + + /** + * 房价通后台服务token + */ + public static final String FANG_JIA_TONG_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhY2NvdW50Ijoib3BlbiIsImV4cCI6MTMxMzQxNTk0MTQ5MTkzLCJvcmdDb2RlIjoiMDAxLjAwMSIsInJvbGVzIjpbImFkbWluIl0sInVzZXJJZCI6IjE4OTkwMDc1OTc0MDY3NzMyNDgiLCJ1c2VybmFtZSI6Ik9QRU7osIPnlKjotKblj7cifQ.ImHYDRYqmrZ13Wtzx87IlUFkUCy-HGf07M4IuaSyXTfPjNjG7FT_zyceWC2V0iTjexwfLyrPAlJtVflNgIsJYQ"; + + /** + * 房价通后台服务UAT地址 + */ + public static final String FANG_JIA_TONG_URL_UAT = "https://api-uat.fangjia.com"; + + /** + * 房价通后台服务生产地址 + */ + public static final String FANG_JIA_TONG_URL_PROD = "https://api.fangjia.com"; + + /** + * 写字楼申请估值报告接口 + */ + public static final String ASSESS_PRICE_REPORT_APPLY = "/office/assessPriceReport/apply"; + + /** + * 写字楼获取估值报告接口 + */ + public static final String ASSESS_PRICE_REPORT_FETCH = "/office/assessPriceReport/fetch"; + + /** + * 处理调用接口回参中的特殊字符 + * @param str + * @return + */ + public static String replaceAll(String str){ + String replaceAll3 = null; + if(!StringUtils.isBlank(str)){ + String replaceAll = str.replaceAll("\\\\", ""); + String replaceAll2 = replaceAll.replaceAll("\"[{]", "{"); + replaceAll3 = replaceAll2.replaceAll("[}]\"", "}"); + } + return replaceAll3; + } + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy index 5a3ce647a..39edb1dfe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy @@ -1,6 +1,6 @@ package com.fangjia.script - +import com.fangjia.core.util.HttpRequest import com.fangjia.script.util.* import com.fangjia.script.yinjihaun.util.DingDingMessageUtil import com.mongodb.BasicDBObject @@ -112,6 +112,18 @@ abstract class BaseBatch { } if(SystemUtils.IS_OS_LINUX){ sendDingDingMsg("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c",msg) + + try { + Map params = new HashMap(); + params.put("phone", "13764369683"); + params.put("type", "taskFail"); + params.put("msg", batchName.substring(batchName.length() - 20, batchName.length())); + HttpRequest httpRequest = new HttpRequest(); + httpRequest.get("http://didata-cloud-server.fangjia.com/sms/send", params, "utf-8"); + } catch (Exception ex) { + + } + task.exception = msg.toString() } }