From f257b2ee35127f76c483a50dc8a27a14c1f0dba0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 28 Dec 2021 15:47:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=90=8E=E6=9C=9F?= =?UTF-8?q?=E6=9C=9B=E4=BB=B7=E4=B8=8D=E5=8F=AF=E5=A1=AB=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E8=BD=BD=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/dal/sql/model/FjtEvaluation.java | 12 ++++++++++++ .../weixin/WeiXinEvaluationController.java | 1 + .../src/main/webapp/weiXinEvaluation/bhreport.ftl | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java index c5991df90..8283df958 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java @@ -102,6 +102,8 @@ public class FjtEvaluation implements SqlEntity{ private String finishDateStr;//竣工时间 private String useType;//房屋用途 + + private Date downPdfDate;//下载报告时间 @GeneratedValue(strategy = GenerationType.AUTO) @Id @@ -750,6 +752,16 @@ public class FjtEvaluation implements SqlEntity{ this.useType = useType; } + + @Column(name = "down_pdf_date") + public Date getDownPdfDate() { + return downPdfDate; + } + + public void setDownPdfDate(Date downPdfDate) { + this.downPdfDate = downPdfDate; + } + @Override public String toString() { return "FjtEvaluation{" + diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 64764ab41..3c0a6bc47 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -1025,6 +1025,7 @@ public class WeiXinEvaluationController { String reporNum = "147698"+ String.valueOf(evaluation.getId()); evaluation.setReportNum(reporNum); + evaluation.setDownPdfDate(new Date()); fjtEvaluationService.updateEvaluation(evaluation); try { diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index e70200bda..2c92f982c 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -88,7 +88,7 @@
鏈熸湜浠凤細 -  涓囧厓 + disabled> 涓囧厓 鎻愪氦 鍒锋柊
From a140beefeffdf61063a052fefc4bb2c5eb641897 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 31 Dec 2021 13:53:45 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8E=BB=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fangjia/open/util/BHBankUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java index 1e18831b4..2c115f3b4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java @@ -441,7 +441,7 @@ public class BHBankUtils { Map params = new HashMap(); params.put("queryId",queryId); if(StringUtils.isNotBlank(reportMsg)){ - params.put("reportMsg",reportMsg); + params.put("reportMsg",reportMsg.replace(" ","")); } From c036d5d677844bb548379b09aadf81890b9f7b8e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 31 Dec 2021 14:15:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/PropertyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 1ba157ee5..f6e9855f0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2363,7 +2363,7 @@ public class PropertyController { mav.setModel(BasicModel.buildBadRequestModel("size(面积)不能为空")); return mav; } - District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName().replace(" ",""), "district"); if (null == district) { mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); From 12c1b22b6de62699f637ac3cc17b89889c1a0eee Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 26 Jan 2022 14:24:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=A4=E6=B5=B7?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E4=BC=B0=E4=BB=B7=E5=A4=B1=E8=B4=A5=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/WeiXinEvaluationController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 3c0a6bc47..272979fca 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -462,8 +462,14 @@ public class WeiXinEvaluationController { }else if(bhDists.size()>1){ int mod = Integer.MAX_VALUE; for(JSONObject jo : bhDists){ - double price = Double.valueOf((String)jo.get("price")); - int bhprice = (int)price; + int bhprice = 0; + if (jo.get("price") == null || jo.get("price").equals("null")) { + bhprice = 0; + } else { + double price = Double.valueOf((String)jo.get("price")); + bhprice = (int)price; + } + int bhmod = Math.abs(bhprice - avgPrice); if(bhmod Date: Tue, 8 Mar 2022 10:20:41 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8F=AF=E8=B4=B7=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index 2c92f982c..165012ff6 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -44,7 +44,7 @@ <#if role?? && role==17 && loanInfoMap??>

鎵�灞炲垎绫伙細${loanInfoMap.type!}绫�

鍙捶鎴愭暟锛�${loanInfoMap.loan_ratio!}鎴�

-

鍙捶閲戦锛�${(fjtEvaluation.totalPrice*loanInfoMap.loan_ratio*0.1/10000)?string('0.##')}涓囧厓

+

鍙捶閲戦锛�${(bohaiEvaluationAudit.inquirePrice*loanInfoMap.loan_ratio*0.1/10000)?string('0.##')}涓囧厓

璐锋鍒╃巼锛�4.5%

<#else> From b2a92c6bf2cb67bd022f83e60ba9bd1ea9737d3b Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 8 Mar 2022 11:05:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=A0=87=E5=87=86=E5=8C=96=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 134 ++++++++++++++++++ .../src/main/resources/urlrewrite2.0.xml | 5 + 2 files changed, 139 insertions(+) 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 907212d5f..07d121e77 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 @@ -106,6 +106,7 @@ public class AddressController { private HouseLoudongService houseLoudongService; private FjtEvaluationService fjtEvaluationService; private AddressMatchProxyService addressMatchProxyService; + private final static String AK = OpenConfig.getConfig().getBaiduAk(); private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); @@ -1705,6 +1706,139 @@ public class AddressController { return mav; } + /** + * 地址标准化接口V2 + * + * @param model + * @return + */ + public Object standardV2Action(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", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch(Exception ex){ + ex.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 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", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch(Exception ex){ + ex.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 divisionStructureAction(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", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch(Exception ex){ + ex.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/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index fb8d631db..0e434c5a4 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -33,5 +33,10 @@ /property/avgPrice + + + /address/standardV2 + + \ No newline at end of file From 73cc32931b8ba44a967b098d61bf60eb987aee07 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 8 Mar 2022 13:44:45 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=A0=87=E5=87=86=E5=8C=96=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fangjia/open/OpenConfig.java | 5 +++++ .../com/fangjia/open/controllers/AddressController.java | 9 ++++++--- .../src/main/resources/fangjia-open.properties | 3 ++- .../fangjia-open/src/main/resources/urlrewrite2.0.xml | 8 ++++---- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java index e1064e8cd..c13a28b36 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/OpenConfig.java @@ -38,6 +38,7 @@ public class OpenConfig extends Configuration { private final String ipdatfile; private final String baiduAk; + private final String defaultCity; private final boolean isOpenAllAuthority; @@ -54,6 +55,7 @@ public class OpenConfig extends Configuration { baiduAk = configuration.get("fangjia.baidu.ak"); isOpenAllAuthority = configuration.getBoolean("fangjia.isOpenAllAuthority", false); enabledAddressMatch = configuration.getBoolean("fangjia.addressMatch.enabled",false); + defaultCity = configuration.get("fangjia.default.city"); } public static OpenConfig getConfig() { @@ -134,4 +136,7 @@ public class OpenConfig extends Configuration { return enabledAddressMatch; } + public String getDefaultCity() { + return defaultCity; + } } 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 07d121e77..d11473fcc 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 @@ -89,6 +89,7 @@ import com.fangjia.service.mongo.fangjia.ServerAreaService; import com.fangjia.service.open.WaitCrawlKeywordsService; import com.fangjia.service.sql.FjtEvaluationService; import com.fangjia.service.web.AddressService; +import org.sothis.web.mvc.annotation.Param; @Authority(role = Role.USER) public class AddressController { @@ -118,6 +119,8 @@ public class AddressController { private static final String GRADE_NATION = "全国评分"; private static final String GRADE_CONSUME = "消费评分"; + public final static OpenConfig CONFIG = OpenConfig.getConfig(); + /** * @deprecated see parse2Action * @param model @@ -1712,7 +1715,7 @@ public class AddressController { * @param model * @return */ - public Object standardV2Action(AddesssMatchModel model) { + public Object standard2Action(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -1723,7 +1726,7 @@ public class AddressController { HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); try{ json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); @@ -1766,7 +1769,7 @@ public class AddressController { HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); // 地址验证无效也输出标准化结果 params.put("flag", "true"); diff --git a/projects/fangjia-open/src/main/resources/fangjia-open.properties b/projects/fangjia-open/src/main/resources/fangjia-open.properties index aaf6af5ca..c7d4d526c 100644 --- a/projects/fangjia-open/src/main/resources/fangjia-open.properties +++ b/projects/fangjia-open/src/main/resources/fangjia-open.properties @@ -100,4 +100,5 @@ fangjia.jms.email.queue=email.queue fangjia.redis_nodes=192.168.0.79:6379,192.168.0.79:6380,192.168.0.79:6381,192.168.0.81:6382,192.168.0.81:6383,192.168.0.81:6384 -fangjia.fangjiatong.url = http://user.fangjia.com/fangjiatong2 \ No newline at end of file +fangjia.fangjiatong.url = http://user.fangjia.com/fangjiatong2 +fangjia.default.city = \u91CD\u5E86\u5E02 \ No newline at end of file diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index 0e434c5a4..ba0a21b49 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -1,8 +1,8 @@ - - + + @@ -33,9 +33,9 @@ /property/avgPrice - + - /address/standardV2 + /address/standard From 4cb8b4cd0f97e7d11ae06d381905f9651541ec8a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 9 Mar 2022 11:10:03 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=9C=B0=E4=B8=8B=E9=9D=A2=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-open/src/main/webapp/static/js/select.js | 11 ++++++++++- .../src/main/webapp/weiXinEvaluation/bhform.ftl | 7 +++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/webapp/static/js/select.js b/projects/fangjia-open/src/main/webapp/static/js/select.js index 6152b33bc..b7c01d2f6 100644 --- a/projects/fangjia-open/src/main/webapp/static/js/select.js +++ b/projects/fangjia-open/src/main/webapp/static/js/select.js @@ -152,7 +152,8 @@ $(document).on('click', '.create-actions03', function () { $("#buildType").val("8") $("#houseFloor").show() $("#floorDesc").hide() - $("#basementAreaLi").hide() + $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -163,6 +164,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -173,6 +175,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -183,6 +186,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -193,6 +197,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -203,6 +208,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -213,6 +219,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").show() + $("#basementAreaLi_intr").show() } }, { @@ -223,6 +230,7 @@ $(document).on('click', '.create-actions03', function () { $("#floorDesc").show() // $("#houseFloor").hide() $("#basementAreaLi").hide() + $("#basementAreaLi_intr").hide() } }, { @@ -233,6 +241,7 @@ $(document).on('click', '.create-actions03', function () { $("#houseFloor").show() // $("#floorDesc").hide() $("#basementAreaLi").hide() + $("#basementAreaLi_intr").hide() } } ]; diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl index 0604782cd..8a39228e1 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl @@ -172,6 +172,13 @@
+
  • +
    +
    + *寤虹瓚闈㈢Н涓惈鏈夊湴涓嬮檮灞為潰绉� +
    +
    +
  • From fbd6971e232b968b054e3dd8c1fb5769d8039e26 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 10 Mar 2022 10:35:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B5=8B=E8=AF=95=E4=B8=93=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) 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 d11473fcc..746bdaa91 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 @@ -1814,7 +1814,7 @@ public class AddressController { HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : "重庆市"); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); params.put("address", model.getAddress()); // 地址验证无效也输出标准化结果 params.put("flag", "true"); @@ -1842,6 +1842,50 @@ public class AddressController { return mav; } + /** + * 地址标准化专用测试接口 + * @param model + * @return + */ + public Object structureForTestAction(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", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureForTest", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureForTest", params, "UTF-8"); + } catch(Exception ex){ + ex.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())) {