From 9041a29f8a1ae75043c92eb32d2e6a7face3ec19 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 5 May 2023 15:50:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE=EF=BC=8C=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=88=AC?= =?UTF-8?q?=E8=99=AB=E6=8A=93=E5=8F=96=E5=B0=8F=E5=8C=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/DistrictController.java | 22 ++- .../fangjia/coresite/model/DistrictModel.java | 8 + .../src/main/webapp/company/about.ftl | 9 +- .../src/main/webapp/district/hidelist.ftl | 21 +++ .../src/main/webapp/header/v5/_footer.ftl | 15 ++ .../src/main/webapp/saleLeads/apply.ftl | 139 +++++++++++------- .../src/main/webapp/sitemap/showDetail.ftl | 2 +- .../src/main/webapp/trend/trend.ftl | 13 +- .../enums/NewResourceRecommendEnum.java | 3 +- .../mongo/fangjia/enums/SalesLeadEnum.java | 3 +- .../main/webapp/style/fangjia/v5/common.css | 22 +++ .../main/webapp/style/fangjia/v5/user01.css | 2 +- 12 files changed, 189 insertions(+), 70 deletions(-) create mode 100644 projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java index b82a39c7c..23728998e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java @@ -1,5 +1,6 @@ package com.fangjia.coresite.controllers; +import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -18,6 +19,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.fangjia.core.util.*; +import com.fangjia.dal.QueryParam; +import com.fangjia.service.datastore.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -69,12 +72,6 @@ import com.fangjia.service.bo.HouseBo; import com.fangjia.service.bo.NewsBo; import com.fangjia.service.bo.RentHouseBo; import com.fangjia.service.common.CookieName; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.HouseService; -import com.fangjia.service.datastore.MicroBlogService; -import com.fangjia.service.datastore.PicService; -import com.fangjia.service.datastore.RegionStatService; -import com.fangjia.service.datastore.RentHouseService; import com.fangjia.service.datastore.bean.DistrictQueryBean; import com.fangjia.service.datastore.bean.HousePriceQueryBean; import com.fangjia.service.datastore.bean.HouseQueryBean; @@ -405,6 +402,19 @@ public class DistrictController { feedFooter(model); return model;*/ } + public Object hidelistAction(HttpServletRequest request,DistrictModel model) throws Exception { + if(StringUtils.isNotBlank(model.getCityName())){ + List params = new ArrayList(); + params.add(new QueryParam("visible", 0)); + params.add(new QueryParam("city", model.getCityName())); + params.add(new QueryParam("category", "district")); + List districts = districtService.findAllByParams(params, 0, 0,new String[]{"city", "region", "name"}); + model.setDistricts(districts); + CacheUtils.putValue(CacheUtils.CachePolicyEnum.NEXT_MONTH, this.getClass(), "district-hide-list-crawl-"+model.getCityName(), (Serializable) districts); + } + + return model; + } /** * µײ¿ÈÈÃÅÍƼö diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java index e3315c836..5ac69e8ef 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java @@ -138,6 +138,7 @@ public class DistrictModel extends BaseModel { private int picOrder; private String bigPicUrl; private int allPicCount; + private List districts; public boolean isHousePriceInfo() { return housePriceInfo; @@ -779,4 +780,11 @@ public class DistrictModel extends BaseModel { this.districtStatBo = districtStatBo; } + public List getDistricts() { + return districts; + } + + public void setDistricts(List districts) { + this.districts = districts; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index ae485ca12..e59fd49cf 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -28,6 +28,7 @@ @media(max-device-width:414px){ .main{padding-top:0;} } + @@ -133,7 +134,7 @@

上海

电 话: 4001883787(周一至周五 09:00-18:00)
邮 箱: gujia@fangjia.com
- 地 址: 上海市黄浦区江宁路212号凯迪克大厦1709
+ 地 址: 上海市静安区江宁路212号凯迪克大厦1709
邮 编: 200003

@@ -200,6 +201,8 @@
+ + <#include "/header/v5/_footer.ftl"/> @@ -238,7 +241,7 @@ $(document).ready(function(){ map.enableScrollWheelZoom(); var content = '
' + - '地址:上海市黄浦区江宁路212号凯迪克大厦1709' + + '地址:上海市静安区江宁路212号凯迪克大厦1709' + '
'; //创建检索信息窗口对象 @@ -271,7 +274,7 @@ $(document).ready(function(){ map.enableScrollWheelZoom(); var content = '
' + - '地址:上海市黄浦区江宁路212号凯迪克大厦1709' + + '地址:上海市静安区江宁路212号凯迪克大厦1709' + '
'; //创建检索信息窗口对象 diff --git a/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl b/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl new file mode 100644 index 000000000..9963b48ae --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl @@ -0,0 +1,21 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + <#include "../jsconstants.ftl" /> + + + + + + +
+ <#list districts! as dist> + ${dist.name!} + +
+<#include "/analytics.ftl" /> + + + \ No newline at end of file diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl index 0ab7f6c02..e7ac0c8db 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -99,6 +99,21 @@ + +
 
+ + <#include "contact.ftl"/>
diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl index a49290b2a..398b218a7 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl @@ -18,8 +18,11 @@ .inputInfoBox01 .inputInfo label.label01a{margin-top:10px;} + @@ -238,28 +242,47 @@
- -   刷新 + +   刷新
- + 发送验证码 + 60s
-
+<#--
--> +<#-- --> +<#-- --> +<#--   刷新--> +<#--
--> +<#--
--> +<#--
--> + +<#--
--> +<#-- --> +<#-- --> +<#-- 发送验证码--> +<#-- 60s--> +<#--
--> +<#--
--> + +
- +
+
- +<#-- --> - 提交 + 提交 + @@ -267,9 +290,9 @@ <#include "/header/v5/_footer.ftl" /> - <#include "../citys.ftl"/>