From cdb97524db4634419852b30efd825f6e37a75f35 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 27 Jul 2023 18:02:07 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=AB=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/bkoff/controllers/DistrictController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 7879767cc..db5bf7e45 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -1920,6 +1920,7 @@ public class DistrictController { district.setMappingAlias(null); } } + district.setModificationDate(new Date()); districtService.save(district); } @@ -1981,6 +1982,7 @@ public class DistrictController { district.setLandProperty(model.getLandProperty()); } + district.setModificationDate(new Date()); districtService.save(district); } return model; From 412dbe46a662596b42ebcbec778a0715388f21a5 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Fri, 28 Jul 2023 17:58:53 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E6=96=B0=E5=8C=B9=E9=85=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddrSvcController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 95d5b2ad4..af7c7300d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -195,7 +195,9 @@ public class AddrSvcController { 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"); +// json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8"); + //新匹配接口 + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); From e63591f2893dee806756fa009c73af846a626713 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Fri, 28 Jul 2023 19:18:41 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddrSvcController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index af7c7300d..95d5b2ad4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -195,9 +195,7 @@ public class AddrSvcController { 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"); - //新匹配接口 - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + 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"); From efef6bfa9ae416cc4f8a3e740d380c28f5cff84f Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Mon, 31 Jul 2023 20:02:07 +0800 Subject: [PATCH 04/43] =?UTF-8?q?=E6=96=B0=E5=8C=B9=E9=85=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 95d5b2ad4..1569c7a87 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -179,7 +179,7 @@ public class AddrSvcController { /** * 地址匹配 */ - public Object matchAction(AddesssMatchModel model) { + public Object matchAction(AddesssMatchModel model) throws Exception { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -195,16 +195,13 @@ public class AddrSvcController { 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"))); - } + //新匹配接口 + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + if (json != null && json.size()>0) { + BasicModel basicModel = new BasicModel(0, "ok"); + basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json)); mav.setModel(basicModel); - } else { + }else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } } catch (Exception e) { From aad027d9ee0ba3e11f9a48fbc347605bb29cbb02 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 1 Aug 2023 11:53:58 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E5=8A=A0ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/coresite/controllers/SaleLeadsController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 52c181ac4..e41d90187 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -165,6 +165,7 @@ public class SaleLeadsController { } + saleLeads = converValue(saleLeads); String body = "业务需求:" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" @@ -363,12 +364,15 @@ public class SaleLeadsController { if (saleLeads.getId()!=null) { saleLeads.setId(null); } + + String ip = AnalyticsUtil.getIpAddress(req); saleLeads = converValue(saleLeads); String body = "业务需求:" + saleLeads.getBusiness() + "\n\n" + "姓名:" + saleLeads.getUname() + "\n\n" + "手机:" + saleLeads.getMobile() + "\n\n" - + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" ; + + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" + + "IP:" + ip+ "\n\n" ; body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { body += "线索来源:百度"; From 0add3e2fb0a79af9dc804bb940912c0c7fbcf830 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Tue, 1 Aug 2023 12:06:36 +0800 Subject: [PATCH 06/43] gj --- .../com/fangjia/coresite/controllers/SaleLeadsController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 52c181ac4..8457816fc 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -364,10 +364,13 @@ public class SaleLeadsController { saleLeads.setId(null); } saleLeads = converValue(saleLeads); + + String ip = AnalyticsUtil.getIpAddress(req); String body = "业务需求:" + saleLeads.getBusiness() + "\n\n" + "姓名:" + saleLeads.getUname() + "\n\n" + "手机:" + saleLeads.getMobile() + "\n\n" + + "IP:"+ip + "\n\n" + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" ; body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { From d27c9c4d5e8bb317847e5282f7ca7f0ac0a71d0e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 3 Aug 2023 11:51:28 +0800 Subject: [PATCH 07/43] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/webapp/index.ftl | 31 ++++++++++++++++++ .../src/main/webapp/images/fangjia/v5/adv.png | Bin 0 -> 358806 bytes 2 files changed, 31 insertions(+) create mode 100644 projects/fangjia-static/src/main/webapp/images/fangjia/v5/adv.png diff --git a/projects/fangjia-coresite/src/main/webapp/index.ftl b/projects/fangjia-coresite/src/main/webapp/index.ftl index 0856b496a..6e149be5b 100644 --- a/projects/fangjia-coresite/src/main/webapp/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/index.ftl @@ -99,6 +99,27 @@ @media(max-device-width:320px){ .searchBoxIndex{top:13.5rem;} } + .advert { + position: fixed; + top: 30%; + left: 40%; + right: 0; + height: 320px; + width: 580px; + z-index: 10000; + } + + .left-ad { + position: absolute; + bottom: 0; + left: 0; + width: 580px; + height: 300px; + background: url("${staticUrl}/images/fangjia/v5/adv.png"); + background-size: 100% 100%; + + } + .advert a{ float: right;margin-right: 10px;cursor: pointer;font-weight: bold;} @@ -108,6 +129,10 @@ <#include "/header/v5/_header.ftl"/> +
@@ -556,7 +581,13 @@ $.config = {router: false}