From 307c7bac6bbfebf8f6baa1ef7ade1a81ca295ead Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Fri, 31 Oct 2025 09:58:34 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=BF=E4=BB=B7?= =?UTF-8?q?=E7=BD=91=E9=92=89=E9=92=89=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fangjia/service/sms/EmppSmsService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sms/EmppSmsService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sms/EmppSmsService.java index 9ca56fc64..214a91398 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/sms/EmppSmsService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sms/EmppSmsService.java @@ -105,7 +105,6 @@ public class EmppSmsService implements SmsService { private void doSend(final String mobile, final String messageContent, final boolean isForRongshidai) throws SmsException { try { - DingDingMessageUtil.sendTextMessage(messageContent); jmsTemplate.send(smsOutgoingDestination, new MessageCreator() { public Message createMessage(Session session) throws JMSException { ActiveMQObjectMessage message = new ActiveMQObjectMessage(); From 5d67323fad821be896c007aa92acb64f71e07445 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Fri, 31 Oct 2025 09:59:13 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=BF=E4=BB=B7?= =?UTF-8?q?=E7=BD=91=E9=92=89=E9=92=89=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/util/PoiSearchResult.groovy | 29 +++ .../com/fangjia/script/util/PoiUtils.groovy | 176 ++++++++++++++++++ .../script/wenyan/temp/LouPanPingJi.groovy | 91 +++++++++ 3 files changed, 296 insertions(+) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiSearchResult.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiUtils.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/LouPanPingJi.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiSearchResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiSearchResult.groovy new file mode 100644 index 000000000..0af5ea201 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiSearchResult.groovy @@ -0,0 +1,29 @@ +package com.fangjia.script.util + +/** + * POI²éѯ½á¹ûÊý¾ÝÀà + */ +class PoiSearchResult { + // ×ÜÊýÁ¿ + long totalCount + + // ×î½ü¾àÀ루Ãף© + Double minDistanceMeters + + // ×î½üµÄN¸öPOIÁбí + List nearestPois = [] + + // ÀàÐͷֲ¼ͳ¼Æ + Map typeDistribution = [:] + + // Ö÷ÀàÐͷֲ¼ͳ¼Æ + Map mainTypeDistribution = [:] + + // ÇøÓò·ֲ¼ͳ¼Æ + Map districtDistribution = [:] + + @Override + String toString() { + return super.toString() + } +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiUtils.groovy new file mode 100644 index 000000000..0b8796e96 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/PoiUtils.groovy @@ -0,0 +1,176 @@ +package com.fangjia.script.util + +import org.apache.http.HttpHost +import org.apache.http.auth.AuthScope +import org.apache.http.auth.UsernamePasswordCredentials +import org.apache.http.client.CredentialsProvider +import org.apache.http.client.config.RequestConfig +import org.apache.http.impl.client.BasicCredentialsProvider +import org.apache.http.impl.nio.client.HttpAsyncClientBuilder +import org.elasticsearch.action.search.SearchRequest +import org.elasticsearch.action.search.SearchResponse +import org.elasticsearch.client.RequestOptions +import org.elasticsearch.client.RestClient +import org.elasticsearch.client.RestClientBuilder +import org.elasticsearch.client.RestHighLevelClient +import org.elasticsearch.common.unit.DistanceUnit +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilders +import org.elasticsearch.search.builder.SearchSourceBuilder +import org.elasticsearch.search.sort.SortBuilders +import org.elasticsearch.search.sort.SortOrder +import org.elasticsearch.xpack.sql.jdbc.EsDataSource + +public class PoiUtils { + + static RestHighLevelClient client = getClient() + + static RestHighLevelClient getClient() { + RestClientBuilder builder = RestClient.builder(new HttpHost("192.168.0.89", 9200, "http")); + builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() { + @Override + RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) { + requestConfigBuilder.setConnectionRequestTimeout(1000 * 60); + requestConfigBuilder.setSocketTimeout(1000 * 180); + return requestConfigBuilder; + } + }) + builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() { + @Override + HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpAsyncClientBuilder) { + httpAsyncClientBuilder.disableAuthCaching(); + CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "elasticsearch")); + httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + return httpAsyncClientBuilder; + } + }) + return new RestHighLevelClient(builder) + } + + /** + * ¸ù¾ݾ­γ¶ÈËÑË÷POI + * @param city + * @param lng + * @param lat + * @param tags + * @param distance + * @param maxResults + * @return + */ + public static PoiSearchResult searchPoi(String city, Double lng, Double lat, List tags =[],String distance = "1km", int maxResults = 20) { + PoiSearchResult poiSearchResult = null + SearchResponse response = null + try { + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder() + // ¹¹½¨²éѯÌõ¼þ + BoolQueryBuilder boolQuery = QueryBuilders.boolQuery() + + // µØÀíλÖòéѯ + boolQuery.must(QueryBuilders.geoDistanceQuery("location") + .point(lat, lng) + .distance(distance)) + + boolQuery.must(QueryBuilders.termQuery("city", city)) + if(!tags.isEmpty()){ + boolQuery.must(QueryBuilders.termsQuery("small_type", tags)) + } + sourceBuilder.trackTotalHits(true) // ǿÖÆ׷×Ù×ÜÊý +// boolQuery.must(QueryBuilders.termQuery("status", "0")) + sourceBuilder.query(boolQuery) + sourceBuilder.sort(SortBuilders.geoDistanceSort("location", lat, lng) + .order(SortOrder.ASC) + .unit(DistanceUnit.METERS)) + sourceBuilder.size(maxResults) + SearchRequest searchRequest = new SearchRequest("didata_map_poi_shards") + searchRequest.source(sourceBuilder) + response = client.search(searchRequest, RequestOptions.DEFAULT) + poiSearchResult = parseSearchResponse(response) + + } catch (Exception e) { + throw new RuntimeException("¸ù¾ÝÃû³ÆËÑË÷POIʧ°Ü: ${e.message}", e) + }finally { + + } + return poiSearchResult + } + + /** + * ½âÎöËÑË÷ÏìӦ + */ + private static PoiSearchResult parseSearchResponse(SearchResponse response) { + PoiSearchResult result = new PoiSearchResult() + // ×ÜÊýÁ¿ + result.totalCount = response.hits.totalHits.value + // ×î½üµÄPOIÁбí + result.nearestPois = parsePoiInfos(response, true) + if(result.nearestPois.size() > 0){ + result.minDistanceMeters = result.nearestPois[0].distanceMeters + } + return result + } + + /** + * ½âÎöPOIÐÅϢÁбí + */ + private static List parsePoiInfos(SearchResponse response, boolean includeDistance = true) { + List pois = [] + response.hits.hits.each { hit -> + def source = hit.sourceAsMap + PoiInfo poi = new PoiInfo( + id: source.id, + name: source.name, + type: source.type, + cat: source.cat, + mainType: source.main_type as Integer, + secondaryType: source.secondary_type, + smallType: source.small_type, + address: source.address, + city: source.city, + district: source.district, + province: source.province, + location: source.location as Map, + dataSource: source.data_source, + status: source.status + ) + // Ìí¼ӾàÀëÐÅϢ + if (includeDistance && hit.sortValues && hit.sortValues.length > 0) { + // ¾àÀëͨ³£ÊÇ×îºóһ¸öÅÅÐò×ֶÎ + def distanceValue = hit.sortValues[hit.sortValues.length - 1] + if (distanceValue instanceof Number) { + poi.distanceMeters = (int)distanceValue.doubleValue() + } + } + pois.add(poi) + } + return pois + } + + + + static void main(String[] args) { + PoiSearchResult result = PoiUtils.searchPoi("ÉϺ£ÊÐ", 121.19563,31.296209, ["±ãÃñÉ̵ê/±ãÀûµê","7-ELEVEn±ãÀûµê","OK±ãÀûµê"]) + println(result) + } +} + + +class PoiInfo { + String id + String name + String type + String cat + Integer mainType + String secondaryType + String smallType + String address + String city + String district + String province + Map location + Integer distanceMeters + String dataSource + String status +} + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/LouPanPingJi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/LouPanPingJi.groovy new file mode 100644 index 000000000..96e53dedf --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/LouPanPingJi.groovy @@ -0,0 +1,91 @@ +package com.fangjia.script.wenyan.temp + +import com.fangjia.core.util.DataUtil +import com.fangjia.script.util.ExcelUtils +import org.apache.commons.lang3.StringUtils + + +public static Double normalize(Double orgValue, double min, double max) { + if (min > max) { + throw new IllegalArgumentException("min should be less than or equal to max"); + } + if(orgValue == null){ + return null; + } + double value = orgValue; + // ´óÓÚ max£º²»¶ϳýÒÔ 2£¬ֱµ½ ¡Ü max + while (value > max) { + value /= 2.0; + } + + // СÓÚ min£º²»¶ϳËÒÔ 2£¬ֱµ½ ¡Ý min + while (value < min) { + if(value < 0){ + value /= 2.0; + }else{ + value *= 2.0; + } + + } + + return DataUtil.roundDouble(value, 2); +} +//def map1 =[:] +//ExcelUtils.read("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¥ÅÌÊý¾Ý2.xlsx").each { +// map1[it[0]] = it[1] +//} +//ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡.xlsx",{List item-> +// item["X"] = map1.getOrDefault(item["A"],null) +// if(item["X"]){ +// DataUtil.roundDouble(item["X"],2) +// } +//}, 1) +// +//ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡.xlsx",{List item-> +// item["X"] = map1.getOrDefault(item["A"],null) +// if(item["X"]){ +// DataUtil.roundDouble(item["X"],2) +// } +//}, 3) + +//ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡.xlsx",{List item-> +// def row = "l" +// if(!(item[row] instanceof Double) && StringUtils.isBlank(item[row])){ +// item[ row] = null +// } +// if(item[row] && item[row] instanceof String){ +// println("---" + item) +// } +// item[row] = normalize(item[row], -30, 20); +// +//},0) +//ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡.xlsx",{List item-> +// def row = "l" +// if(!(item[row] instanceof Double) && StringUtils.isBlank(item[row])){ +// item[ row] = null +// } +// if(item[row] && item[row] instanceof String){ +// println("---" + item) +// } +// item[row] = normalize(item[row], -30, 20); +//},1) +ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡V3.xlsx",{List item-> + def row = "l" + if(!(item[row] instanceof Double) && StringUtils.isBlank(item[row])){ + item[ row] = null + } + if(item[row] && item[row] instanceof String){ + println("---" + item) + } + item[row] = normalize(item[row], -30, 13); +},2) +ExcelUtils.multiThreadingModify("C:\\Users\\goojia\\Desktop\\¥ÅÌÆÀ¼¶\\¹À¼ҿƼ¼¥ÅÌÆÀ¼¶Êý¾ݲâÊԷ´À¡V3.xlsx",{List item-> + def row = "l" + if(!(item[row] instanceof Double) && StringUtils.isBlank(item[row])){ + item[ row] = null + } + if(item[row] && item[row] instanceof String){ + println("---" + item) + } + item[row] = normalize(item[row], -30, 13); +},3) From 19867cd1d791668fd99d878c599388bd8e8fdc61 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Fri, 31 Oct 2025 11:22:27 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=A7=9F=E9=87=91=E6=9C=88=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=98=AF12=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/SqmetreRentController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java index 313fa748a..d00eb39d5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java @@ -92,7 +92,7 @@ public class SqmetreRentController { // ÉèÖ÷µ»ؽá¹û£¬·Àֹ subList Խ½ç if (result.size() > 1) { - mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size()))); + mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { mav.setModel(BasicModel.buildOKModel().setResult(null)); } @@ -166,7 +166,7 @@ public class SqmetreRentController { // ÉèÖ÷µ»ؽá¹û£¬·Àֹ subList Խ½ç if (result.size() > 1) { - mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size()))); + mav.setModel(BasicModel.buildOKModel().setResult(result)); } else { mav.setModel(BasicModel.buildOKModel().setResult(null)); } From 415e8946c2b033f44f7c093276cd004c5c705ae7 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 31 Oct 2025 20:43:41 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 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 852bbd508..3174945c7 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 @@ -864,9 +864,9 @@ public class AddrSvcController { if (result.containsKey("town")) { map.put("town", result.getString("town")); } - if (result.containsKey("committee")) { - map.put("committee", result.getString("committee")); - } +// if (result.containsKey("committee")) { +// map.put("committee", result.getString("committee")); +// } if (result.containsKey("provinceCode")) { map.put("provinceCode", result.getString("provinceCode")); } @@ -879,15 +879,15 @@ public class AddrSvcController { if (result.containsKey("townCode")) { map.put("townCode", result.getString("townCode")); } - if (result.containsKey("committeeCode")) { - map.put("committeeCode", result.getString("committeeCode")); - } - if (result.containsKey("typeCode")) { - map.put("typeCode", result.getString("typeCode")); - } - if (result.containsKey("typeName")) { - map.put("typeName", result.getString("typeName")); - } +// if (result.containsKey("committeeCode")) { +// map.put("committeeCode", result.getString("committeeCode")); +// } +// if (result.containsKey("typeCode")) { +// map.put("typeCode", result.getString("typeCode")); +// } +// if (result.containsKey("typeName")) { +// map.put("typeName", result.getString("typeName")); +// } if (result.containsKey("verifyFlag")) { map.put("verifyFlag", result.getString("verifyFlag")); } else { @@ -921,6 +921,9 @@ public class AddrSvcController { if (result.containsKey("countyGovTown")) { map.put("countyGovTown", result.getString("countyGovTown")); } + if (result.containsKey("remark")) { + map.put("remark", result.getString("remark")); + } basicModel.setResult(map); mav.setModel(basicModel); } else { From af77031018bf7c4096b7651130e8784ee975313f Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 5 Nov 2025 18:23:31 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=88=90=E4=BA=A4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9C=9D=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fangjia/open/model/CommercialModel.java | 6 +++--- .../fangjia/service/mongo/fangjia/DealPriceServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java index 0a91d3da7..a136e8ef0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java @@ -14,7 +14,7 @@ public class CommercialModel extends FangjiaApiModel{ private Integer maxFloor;//×Ü¥²ã private Integer passengerFlow;//¿ÍÁ÷Á¿---0:¸ß 1:ÖÐ 2:µÍ - private Integer LeaseStability;//×âԼÎȶ¨ÐÔ---0:³ÖÐøÎȶ¨³ö×â 1:½׶ÎÐԳö×â 2:ż¶û³ö×â 3:δ³ö×â + private Integer leaseStability;//×âԼÎȶ¨ÐÔ---0:³ÖÐøÎȶ¨³ö×â 1:½׶ÎÐԳö×â 2:ż¶û³ö×â 3:δ³ö×â private Integer sellType;//³öÊÛ/תÈÃ---0:³öÊÛ 1:תÈà private Integer decorationCost;//װÐ޳ɱ¾(µ¥λ:ÍòԪ) private Integer decorationYear;//װÐÞÄêÏÞ(µ¥λ:Äê) @@ -72,11 +72,11 @@ public class CommercialModel extends FangjiaApiModel{ } public Integer getLeaseStability() { - return LeaseStability; + return leaseStability; } public void setLeaseStability(Integer leaseStability) { - LeaseStability = leaseStability; + leaseStability = leaseStability; } public Integer getSellType() { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java index dd205bd77..8a93f201e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java @@ -177,7 +177,7 @@ public class DealPriceServiceImpl implements DealPriceService { sortParams.add(new SortParam("tradeDate", false)); return dealPriceDao.findAllByParams(params, sortParams, 0, max, new String[] { "city", "region", "districtName", "avgPrice", "fitment", "area", "totalPrice", - "tradeDate", "source", "room", "hall", "toilet", "height", "floor" }); + "tradeDate", "source", "room", "hall", "toilet", "height", "floor","direction" }); } @Override From 6ee5aa79756382d31afd3d31006c7634880a97bd Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 1 Dec 2025 13:44:14 +0800 Subject: [PATCH 06/15] update --- .../java/com/fangjia/open/controllers/CommercialController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index d670c7367..8137c18b1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -93,7 +93,7 @@ public class CommercialController { if (json != null) { if (json.containsKey("msg") && "³ɹ¦".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); - resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice"))); + resultMap.put("avgPrice", Double.valueOf(json.getString("unitPrice"))); resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice"))); if (model.getShowSample()!=null && model.getShowSample()==1 && json.containsKey("case")) { From 82dca1449010cf90714e8245c80933ef6459ef84 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 1 Dec 2025 13:46:55 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/CommercialController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 8137c18b1..29a6066d0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -80,6 +80,11 @@ public class CommercialController { } + /** + * ÉÌÆ̳ö×â + * @param model + * @return + */ public Object shopRentEvaluateAction(CommercialModel model) { RestfulModelAndView mav = new RestfulModelAndView(); From 889f5751169131b179e2d963130d5ec8e26db587 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 8 Dec 2025 11:22:13 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=95=86=E9=93=BA=E4=BC=B0=E5=80=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=9F=8E=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/CommercialController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index 29a6066d0..d26105bd5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -203,6 +203,9 @@ public class CommercialController { HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); + if(StringUtils.isNotBlank(model.getCityName())){ + params.put("city", model.getCityName()); + } if(StringUtils.isNotBlank(model.getAddress())){ params.put("address", model.getAddress()); } From 476fe6471fe06df9bb94ea7d8110f1cb897e4015 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 18 Dec 2025 12:10:54 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/OfficeSellController.java | 74 ++- .../open/controllers/PoiController.java | 2 +- .../open/controllers/PropertyController.java | 534 +++++++++++++++++- .../com/fangjia/open/dto/HouseCaseDto.java | 150 +++++ .../open/model/PropertyEvaluationModel.java | 65 +++ .../src/main/resources/urlrewrite2.0.xml | 6 + .../service/address/AddressParserImpl.java | 1 + .../service/api/AddressMatchProxyService.java | 11 + .../api/AddressMatchProxyServiceImpl.java | 29 + .../datastore/DistrictSellStatService.java | 11 +- .../DistrictSellStatServiceImpl.java | 13 + .../datastore/DistrictServiceImpl.java | 10 +- .../service/datastore/HouseService.java | 28 + .../service/datastore/HouseServiceImpl.java | 252 ++++++++- .../service/datastore/OfficeServiceImpl.java | 13 +- .../mongo/fangjia/DealPriceService.java | 2 + .../mongo/fangjia/DealPriceServiceImpl.java | 27 + 17 files changed, 1187 insertions(+), 41 deletions(-) create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index 340914d13..3157eaf17 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -222,32 +222,50 @@ public class OfficeSellController { public Object evaluateSellAction(PropertyEvaluationModel model, HttpServletRequest request) { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) - || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0 || model.getCity().contains("ȫ¹ú") - || model.getDistrict().contains("ȫ¹ú")) { - mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:³ÇÊÐ,ÇøÓò,д×Ö¥Ãû,Ãæ»ý(size)Ϊ±ØÌîÏî")); + + if (StringUtils.isBlank(model.getCity()) || model.getSize()<=0) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:³ÇÊÐ,Ãæ»ýΪ±ØÌîÏî")); return mav; } - if (model.getCity().endsWith("ÊÐ")) { - model.setCity(model.getCity().replaceAll("ÊÐ$", "")); + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:Ãû³ƻòµØַÖÁÉÙÌîһ¸ö")); + return mav; } + + /* Ïȵ½CPDB¿âÖвéÕÒд×Ö¥ */ - District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); + District district = null; + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())) { + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), "office"); + } if (district == null) { - if (model.getDistrict().contains("ÊÐϽÇø") || model.getDistrict().contains(model.getCity())) { + if (StringUtils.isNotBlank(model.getDistrict()) && (model.getDistrict().contains("ÊÐϽÇø") || model.getDistrict().contains(model.getCity()))) { district = districtService.findByNameAndAlias(model.getCity(), null, model.getName(), "office"); } - if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("¸Ãд×Ö¥²»´æÔÚ")); - return mav; + + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "office", false); + }else if(StringUtils.isNotBlank(model.getName())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "office", false); } + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + + if (district == null) { + mav.setModel(BasicModel.buildBadRequestModel("¸Ãд×Ö¥²»´æÔÚ")); + return mav; } model.setName(district.getName()); - if (model.getCarportPrice() != null && (model.getCarportPrice() < 0 || model.getCarportPrice() > 1000000)) { - mav.setModel(BasicModel.buildBadRequestModel("carportPrice(³µλ)ȡֵ²»ºϷ¨")); - return mav; - } if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { mav.setModel(BasicModel.buildBadRequestModel("maxFloorȡֵ·Ƿ¨,Õýȷ·¶Χ[1,60)")); return mav; @@ -287,16 +305,19 @@ public class OfficeSellController { districtPriceMap.put("district", district.getRegion()); districtPriceMap.put("name", district.getName()); districtPriceMap.put("unitPrice", evaluation.getUnitPrice()); - districtPriceMap.put("samples", evaluation.getSeawater()); - - mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); - try { - if (StringUtils.isNotBlank(evaluation.getFromUserId()) && !evaluation.getFromUserId().equals("1007497")) { - openApiLogService.saveLog(CommonUtils.convertToMap(model), districtPriceMap, evaluation, "/officeSell/evaluateSell"); - } - } catch (Exception e) { - e.printStackTrace(); + Long totalPrice = (long) (evaluation.getUnitPrice() * model.getSize()); + districtPriceMap.put("totalPrice", totalPrice); + if(model.getShow()!=null && model.getShow()==1){ + districtPriceMap.put("samples", evaluation.getSeawater()); } + mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); +// try { +// if (StringUtils.isNotBlank(evaluation.getFromUserId()) && !evaluation.getFromUserId().equals("1007497")) { +// openApiLogService.saveLog(CommonUtils.convertToMap(model), districtPriceMap, evaluation, "/officeSell/evaluateSell"); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } return mav; } else { @@ -473,7 +494,10 @@ public class OfficeSellController { if (StringUtils.isNotBlank(model.getOtherFactor())) { evaluation.setOtherFactor(model.getOtherFactor()); } - evaluation.setRegion(model.getDistrict()); + if(StringUtils.isNotBlank(model.getDistrict())){ + evaluation.setRegion(model.getDistrict()); + } + if (null != model.getRoom()) { evaluation.setRoom(model.getRoom()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java index 08c74dfef..18b6f3b6d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java @@ -372,7 +372,7 @@ public class PoiController { for (Map hit : hits) { Map source = (Map) hit.get("_source"); - if (source.containsKey("name")) { + if (source.containsKey("name") && !source.get("name").toString().contains("¹«˾")) { poiNames.add(source.get("name").toString()); } } 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 18270c8ab..c4a7831bf 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 @@ -51,6 +51,7 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.solr.client.solrj.util.ClientUtils; import org.bson.types.ObjectId; import org.slf4j.Logger; import org.sothis.core.util.CollectionUtils; @@ -1660,7 +1661,16 @@ public class PropertyController { } } } - + if (district == null) { + //ʹÓÃÐÂƥÅäÔÙÅäһ±飬²»¼ÓÀàÐͣ¬Óнá¹û£¬ÀàÐÍΪdistrictÔò×ßСÇø¹Àֵ£¬ÆäËüÀàÐÍҲ×߾­γ¶ȹÀֵ + JSONObject resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); + if (resultObject != null && resultObject.containsKey("category") && resultObject.get("category")!=null) { + if(resultObject.containsKey("id") && resultObject.get("category").equals("district")){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + } if (district == null) { //¼ÓÉϸߵ»ñȡ¾­γ¶È ºÍ ¸ù¾ݾ­γ¶ȹÀֵ @@ -2493,9 +2503,19 @@ public class PropertyController { item.put("name", districtStat.getDistrictName()); item.put("avgPrice", districtStat.getAvgPrice()); item.put("date", districtStat.getDate() / 100 + "-" + String.format("%02d", districtStat.getDate() % 100)); - item.put("changePercent", BigDecimal.valueOf(districtStat.getMom() * 100) - .setScale(2, RoundingMode.HALF_UP) - .doubleValue()); + if(null == districtStat.getMom()){ + if(result.size()>0){ + Integer avgPrice = (Integer) result.get(result.size() - 1).get("avgPrice"); + double mom = (districtStat.getAvgPrice() - avgPrice)*100.0/avgPrice; + item.put("changePercent", DataUtil.getRound(2, mom)); + }else{ + item.put("changePercent", 0); + } + }else{ + item.put("changePercent", BigDecimal.valueOf(districtStat.getMom() * 100) + .setScale(2, RoundingMode.HALF_UP) + .doubleValue()); + } result.add(item); } } @@ -6013,6 +6033,512 @@ public class PropertyController { return mav; } + public Object sellCaseAction(PropertyEvaluationModel model, HttpServletRequest request){ + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:³ÇÊÐΪ±ØÌîÏî")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:Ãû³ƻòµØַÖÁÉÙÌîһ¸ö")); + return mav; + } + + String estateType = null; + if(StringUtils.isNotBlank(model.getPropertyType())){ + if(model.getPropertyType().equals("0")){ + estateType = "ÆÕͨסլ"; + }else if(model.getPropertyType().equals("1")){ + estateType = "±ðÊû"; + }else if(model.getPropertyType().equals("2")){ + estateType = "ÉÌס"; + } + } + + District district = null; + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + if(StringUtils.isNotBlank(model.getEstateType()) && model.getEstateType().equals("±ðÊû") && !model.getName().contains("±ðÊû")){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName()+"±ðÊû","district"); + }else{ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); + }else if(StringUtils.isNotBlank(model.getName())){ + if(estateType !=null && estateType.equals("±ðÊû") && !model.getName().contains("±ðÊû")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"±ðÊû", "property", false); + }else{ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); + } + + } + + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + if(district == null && StringUtils.isBlank(model.getLocation())){ + mav.setModel(BasicModel.buildOKModel().setResult(null)); + return mav; + } + + + String startDate = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -3),"yyyyMMdd"); + String endDate = DateUtil.formatByPattern(new Date(), "yyyyMMdd"); + + List caseDtos = new ArrayList(); + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { + pager.setPageSize(model.getPageSize()); +// if(model.getPageSize() <=50){ +// pager.setPageSize(model.getPageSize()); +// }else{ +// pager.setPageSize(50); +// } + } else { + pager.setPageSize(5); + } + + // ĬÈÏ1¹«ÀïÄÚ + if (model.getRadius() == null) { + model.setRadius(1000); + } + + + if(district != null){ + if(model.getMinPrice() == null){ + DistrictSellStat districtSellStat = districtSellStatService.findFirstByParams(district.getCity(), district.getRegion(), district.getName()); + if(districtSellStat != null) { + int minPrice = (int) (districtSellStat.getAvgPrice() - districtSellStat.getAvgPrice() * 0.1); + model.setMinPrice(minPrice); + + int maxPrice = (int) (districtSellStat.getAvgPrice() + districtSellStat.getAvgPrice() * 0.1); + model.setMaxPrice(maxPrice); + } + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + model.setMinPrice(model.getMinPrice()); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + model.setMaxPrice(model.getMaxPrice()); + } + } + //ÏȲé³ɽ»°¸Àý + Date startTime = DateUtil.parseDate(startDate,"yyyyMMdd"); + Date endTime = DateUtil.parseDate(endDate,"yyyyMMdd"); + List dealPrices = dealPriceService.findDealPrices(district.getId(), pager.getPageSize(), model.getMinPrice(), model.getMaxPrice(), startTime, endTime); + + if(dealPrices!=null && dealPrices.size()>0){ + caseDtos = createDealHouseCase(caseDtos, dealPrices, 0, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + + if(caseDtos.size() < pager.getPageSize()){ + //²é×ÔÉíÑù±¾ + List houseSelf = houseService.findSelfHouseByParams(district, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("±ðÊû")){ + District newDist = new District(); + newDist.setCity(district.getCity()); + newDist.setRegion(district.getRegion()); + newDist.setName(district.getName().replace("±ðÊû","")); + newDist.setEstateType2(estateType); + houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + } + //ÓÐÎïҵÀàÐÍÇÒ×ÔÉíÑù±¾Êý¾ݲ»×㣬ºöÂÔÎïҵÀàÐͲé + if(caseDtos.size() ==0 && StringUtils.isNotBlank(estateType)){ + District newDist = new District(); + newDist.setCity(district.getCity()); + newDist.setRegion(district.getRegion()); + newDist.setName(district.getName().replace("±ðÊû","")); + newDist.setEstateType2(estateType); + houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + } + + //×ÔÉíÑù±¾²»×㣬²éÖܱ߳ɽ» + List districts = districtService.findNearestDistrict(district, 1000, 20); + if(districts!=null && districts.size()>0){ + for(District d : districts){ + if(!district.getId().equals(d.getId())){ + dealPrices = dealPriceService.findDealPrices(d.getId(), pager.getPageSize(), model.getMinPrice(), model.getMaxPrice(), DateUtil.parseDate(startDate,"yyyyMMdd"), DateUtil.parseDate(endDate,"yyyyMMdd")); + if(dealPrices!=null && dealPrices.size()>0 && d.getLng()!=null && d.getLng()>0){ + double distance = GeoUtils.calculateDistance(district.getLng()/10000000000.0, district.getLat()/10000000000.0, d.getLng()/10000000000.0, d.getLat()/10000000000.0); + caseDtos = createDealHouseCase(caseDtos, dealPrices, (int)distance, model.getShowSource()); + if(caseDtos.size()>pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + break; + } + } + } + } + if(caseDtos.size() == pager.getPageSize()){ + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + } + + } + + //×ÔÉí³ɽ»£¬×ÔÉíÑù±¾£¬Öܱ߳ɽ»²»×㣬²éÖܱ߹ÒÅÆ + List houseAround = null; + if (caseDtos.size() < pager.getPageSize() ) { + Double lng = null; + Double lat = null; + if(district!=null && district.getLat()!=null && district.getLat()>0){ + lng = district.getLng()/10000000000.0; + lat = district.getLat()/10000000000.0; + if(estateType == null ){ + estateType = district.getEstateType2(); + } + }else if(StringUtils.isNotBlank(model.getLocation())){ + String[] locationStr = model.getLocation().split(","); + String numberPattern = "-?\\d+(\\.\\d+)?"; // ƥÅäÕûÊý»򸡵ãÊý + for (String loc : locationStr) { + if (!loc.trim().matches(numberPattern)) { + mav.setModel(BasicModel.buildBadRequestModel("location(¾­γ¶È)¸ñʽ´íÎó")); + return mav; + } + } + lng = Double.valueOf(locationStr[0]); + lat = Double.valueOf(locationStr[1]); + if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { + mav.setModel(BasicModel.buildBadRequestModel("·ÇÖйú¾­γ¶È")); + return mav; + } + } + if(lat !=null && lat>0){ + houseAround = houseService.findArroundHouseByParams("sell", lng, lat, Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager, model.getRadius()); + } + if(houseAround != null && houseAround.size()>0){ + caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource()); + } + } + if(caseDtos.size()>pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + } + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + + + public Object rentCaseAction(PropertyEvaluationModel model, HttpServletRequest request){ + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:³ÇÊÐΪ±ØÌîÏî")); + return mav; + } + + if (StringUtils.isBlank(model.getName()) && StringUtils.isBlank(model.getAddress()) ) { + mav.setModel(BasicModel.buildBadRequestModel("²ÎÊý·Ƿ¨:Ãû³ƻòµØַÖÁÉÙÌîһ¸ö")); + return mav; + } + + District district = null; + String estateType = null; + if(StringUtils.isNotBlank(model.getPropertyType())){ + if(model.getPropertyType().equals("0")){ + estateType = "ÆÕͨסլ"; + }else if(model.getPropertyType().equals("1")){ + estateType = "±ðÊû"; + }else if(model.getPropertyType().equals("2")){ + estateType = "ÉÌס"; + } + } + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), "property", false); + }else if(StringUtils.isNotBlank(model.getName())){ + if(estateType !=null && estateType.equals("±ðÊû") && !model.getName().contains("±ðÊû")){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName()+"±ðÊû", "property", false); + }else{ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getName(), "property", false); + } + + } + + if(resultObject != null){ + String id = (String) resultObject.get("id"); + district = districtService.findById(id); + } + } + if(district == null && StringUtils.isBlank(model.getLocation())){ + mav.setModel(BasicModel.buildOKModel().setResult(null)); + return mav; + } + + String startDate = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -6),"yyyyMMdd"); + String endDate = DateUtil.formatByPattern(new Date(), "yyyyMMdd"); + + List caseDtos = new ArrayList(); + + Pager pager = new Pager(); + pager.setStartRow(0); + if (model.getPageSize() != null) { +// pager.setPageSize(model.getPageSize()); + if(model.getPageSize() <=50){ + pager.setPageSize(model.getPageSize()); + }else{ + pager.setPageSize(50); + } + } else { + pager.setPageSize(5); + } + + // ĬÈÏ1¹«ÀïÄÚ + if (model.getRadius() == null) { + model.setRadius(1000); + } + + + if(district != null){ + if(model.getMinPrice() == null){ + SqmetreRent rent = sqmetreRentService.findNearestSqmetreRent(district.getCity(), district.getRegion(), district.getName(), "district"); + + if(rent != null) { + int minPrice = (int) (rent.getAvgPrice().intValue() - rent.getAvgPrice().intValue() * 0.1); + model.setMinPrice(minPrice); + + int maxPrice = (int) (rent.getAvgPrice().intValue() + rent.getAvgPrice().intValue() * 0.1); + model.setMaxPrice(maxPrice); + } + }else{ + if(model.getMinPrice() != null && model.getMinPrice()>0){ + model.setMinPrice(model.getMinPrice()); + } + if(model.getMaxPrice() != null && model.getMaxPrice()>0){ + model.setMaxPrice(model.getMaxPrice()); + } + } + + + if(caseDtos.size() < pager.getPageSize()){ + //²é×ÔÉíÑù±¾ + List houseSelf = houseService.findSelfHouseByParams(district, "rent", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + + if(caseDtos.size() < pager.getPageSize() && StringUtils.isNotBlank(estateType) && district.getName().contains("±ðÊû")){ + District newDist = new District(); + newDist.setCity(district.getCity()); + newDist.setRegion(district.getRegion()); + newDist.setName(district.getName().replace("±ðÊû","")); + newDist.setEstateType2(estateType); + houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + } + + + //ÓÐÎïҵÀàÐÍÇÒ×ÔÉíÑù±¾Êý¾ݲ»×㣬ºöÂÔÎïҵÀàÐͲé + if(caseDtos.size() ==0 && StringUtils.isNotBlank(estateType)){ + District newDist = new District(); + newDist.setCity(district.getCity()); + newDist.setRegion(district.getRegion()); + newDist.setName(district.getName().replace("±ðÊû","")); + newDist.setEstateType2(estateType); + houseSelf = houseService.findSelfHouseByParams(newDist, "sell", Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), null, pager); + if(houseSelf!=null && houseSelf.size()>0){ + caseDtos = createHouseCase(caseDtos, houseSelf, model.getShowSource()); + if(caseDtos.size() == pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + } + } + } + } + + //×ÔÉíÑù±¾²»×㣬²éÖܱ߹ÒÅÆ + List houseAround = null; + if (caseDtos.size() < pager.getPageSize() ) { + Double lng = null; + Double lat = null; + if(district!=null && district.getLat()!=null && district.getLat()>0){ + lng = district.getLng()/10000000000.0; + lat = district.getLat()/10000000000.0; + if(estateType == null ){ + estateType = district.getEstateType2(); + } + }else if(StringUtils.isNotBlank(model.getLocation())){ + String[] locationStr = model.getLocation().split(","); + String numberPattern = "-?\\d+(\\.\\d+)?"; // ƥÅäÕûÊý»򸡵ãÊý + for (String loc : locationStr) { + if (!loc.trim().matches(numberPattern)) { + mav.setModel(BasicModel.buildBadRequestModel("location(¾­γ¶È)¸ñʽ´íÎó")); + return mav; + } + } + lng = Double.valueOf(locationStr[0]); + lat = Double.valueOf(locationStr[1]); + if (lng < 70 || lng > 140 || lat < 0 || lat > 55) { + mav.setModel(BasicModel.buildBadRequestModel("·ÇÖйú¾­γ¶È")); + return mav; + } + } + if(lat !=null && lat>0){ + houseAround = houseService.findArroundHouseByParams("rent", lng, lat, Integer.parseInt(startDate), Integer.parseInt(endDate), model.getMinPrice(), model.getMaxPrice(), estateType, pager, model.getRadius()); + } + if(houseAround != null && houseAround.size()>0){ + caseDtos = createHouseCase(caseDtos, houseAround, model.getShowSource()); + } + } + if(caseDtos.size()>pager.getPageSize()){ + caseDtos = caseDtos.subList(0, caseDtos.size()-1); + } + mav.setModel(BasicModel.buildOKModel().setResult(caseDtos)); + return mav; + } + + + + private List createDealHouseCase(List caseDtos, List dealPrices,int distance, Integer showSource){ + if(dealPrices!=null && dealPrices.size()>0){ + List ids = new ArrayList(); + for(HouseCaseDto dto : caseDtos){ + ids.add(dto.getId()); + } + for(DealPrice dp : dealPrices){ + if(!ids.contains(dp.getId())){ + HouseCaseDto dto = new HouseCaseDto(); + dto.setId(dp.getId()); + dto.setCity(dp.getCity()); + dto.setDistrict(dp.getRegion()); + dto.setName(dp.getDistrictName()); + dto.setSize(dp.getArea()); + dto.setDistance(distance); + dto.setUnitPrice(dp.getAvgPrice()); + dto.setTotalPrice(dp.getTotalPrice()); + dto.setDecoration(dp.getFitment()); + dto.setDirection(dp.getDirection()); + dto.setFloor(dp.getFloor()); + dto.setMaxFloor(dp.getHeight()); + dto.setRoom(String.valueOf(dp.getRoom())); + dto.setHall(String.valueOf(dp.getHall())); + dto.setCaseDate(DateUtil.formatByPattern(dp.getTradeDate(), "yyyy-MM-dd")); + if(showSource!=null && showSource==1){ + dto.setSource("³ɽ»"); + } + caseDtos.add(dto); + } + } + return caseDtos; + } + return null; + } + + + private List createHouseCase(List caseDtos, List houses, Integer showSource){ + if (houses != null && !houses.isEmpty()) { + Set seenIds = new HashSet(); + Iterator iterator = houses.iterator(); + while (iterator.hasNext()) { + Seawater s = iterator.next(); + if (!seenIds.add(s.getId())) { + // Èç¹ûÒѾ­´æÔڣ¬Ôò´ÓÁбíÖÐÒƳý + iterator.remove(); + } + } + + List ids = new ArrayList(); + for(HouseCaseDto dto : caseDtos){ + ids.add(dto.getId()); + } + for (Seawater house : houses) { + if(!ids.contains(house.getId())){ + HouseCaseDto caseDto = new HouseCaseDto(); + caseDto.setId(house.getId()); + caseDto.setCity(house.getCity()); + caseDto.setDistrict(house.getRegion()); + caseDto.setName(house.getDistrictName()); + caseDto.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); + caseDto.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + caseDto.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); + caseDto.setDirection(house.getDirection()); + caseDto.setDecoration(house.getFitment()); + caseDto.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); + caseDto.setMaxFloor(house.getHeight() == null || house.getHeight() == 0 ? null : house.getHeight()); + caseDto.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom().toString()); + caseDto.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall().toString()); + + if (house.getpDate() != null && house.getpDate() > 10000000) { + String numberStr = String.valueOf(house.getpDate()); + // ²ð·Ö×ַû´®²¢¸ñʽ»¯ + String year = numberStr.substring(0, 4); // ǰËÄλÊÇÄê·Ý + String month = numberStr.substring(4, 6); // ÖмäÁ½λÊÇÔ·Ý + String day = numberStr.substring(6, 8); // ×îºóÁ½λÊÇÈÕÆÚ + String formattedDate = year + "-" + month + "-" + day; + caseDto.setCaseDate(formattedDate); + } + caseDto.setDistance(house.getDistance()); + if(showSource!=null && showSource==1){ + caseDto.setSource("¹ÒÅÆ"); + } + caseDtos.add(caseDto); + } + } + } + return caseDtos; + } public void setHouseLoudongService(HouseLoudongService houseLoudongService) { this.houseLoudongService = houseLoudongService; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java new file mode 100644 index 000000000..f662a9eba --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/HouseCaseDto.java @@ -0,0 +1,150 @@ +package com.fangjia.open.dto; + +public class HouseCaseDto { + + private String id;//·¿Դid + private String city;//³ÇÊÐ + private String district;//ÇøÓò + private String name;//¥ÅÌÃû³Æ + private Integer distance;//¾àÀë(µ¥λ£ºÃ×) + private Double size;//Ãæ»ý(µ¥λ£ºƽÃ×) + private Integer unitPrice;//µ¥¼Û(µ¥λ£ºԪ/ƽÃ×) + private Integer totalPrice;//×ܼÛ(µ¥λ£ºԪ) + private String decoration;//װÐޣ¨È磺¾«װ£© + private String direction;//³¯Ïò£¨È磺Äϣ© + private Integer floor;//ËùÔÚ¥²ã + private Integer maxFloor;//×Ü¥²ã + private String room;//ÊÒ + private String hall;//Ìü + private String caseDate;//°¸Àýʱ¼䣨Èç: 2013-07-12£© + private String source;//À´Դ + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + 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 Integer getDistance() { + return distance; + } + + public void setDistance(Integer distance) { + this.distance = distance; + } + + public Double getSize() { + return size; + } + + public void setSize(Double size) { + this.size = size; + } + + public Integer getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(Integer unitPrice) { + this.unitPrice = unitPrice; + } + + public Integer getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Integer totalPrice) { + this.totalPrice = totalPrice; + } + + public String getDecoration() { + return decoration; + } + + public void setDecoration(String decoration) { + this.decoration = decoration; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + 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 getRoom() { + return room; + } + + public void setRoom(String room) { + this.room = room; + } + + public String getHall() { + return hall; + } + + public void setHall(String hall) { + this.hall = hall; + } + + public String getCaseDate() { + return caseDate; + } + + public void setCaseDate(String caseDate) { + this.caseDate = caseDate; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index 0d134164c..fe0c4f31b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -296,6 +296,39 @@ public class PropertyEvaluationModel extends FangjiaApiModel { private String sampleIds; + private Integer max; + + + private Date startDate; + private Date endDate; + private Integer pageSize; + + /** + * ÏÔʾÀ´Դ + */ + private Integer showSource; + + /** + * ÏÔʾ·¿Դ 1:ÏÔʾ 0£ºĬÈÏ ²»ÏÔʾ + */ + private Integer show; + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public Integer getShowSource() { + return showSource; + } + + public void setShowSource(Integer showSource) { + this.showSource = showSource; + } + public void setDecorationAge(int decorationAge) { this.decorationAge = decorationAge; } @@ -962,4 +995,36 @@ public class PropertyEvaluationModel extends FangjiaApiModel { public String getSampleIds() { return sampleIds; } + + public Integer getMax() { + return max; + } + + public void setMax(Integer max) { + this.max = max; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Integer getShow() { + return show; + } + + public void setShow(Integer show) { + this.show = show; + } } diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index 22c9f3057..49a308d0a 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -49,5 +49,11 @@ + + + /evaluateSell + + + \ No newline at end of file diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserImpl.java index c5416a402..65204b58b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserImpl.java @@ -1469,6 +1469,7 @@ public class AddressParserImpl implements AddressParser { .replaceAll("¡¾¡¿£¨£©\\(\\)\\[\\]", "").replaceAll("\\*+", "").replaceAll("[\\s¡¡]+", ""); } + public void setDistrictService(DistrictService districtService) { this.districtService = districtService; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyService.java index 01e5b41dc..dc7c83017 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyService.java @@ -88,5 +88,16 @@ public interface AddressMatchProxyService { JSONObject addressStructure(String city, String address); + + + /** + * ×îеÄƥÅäË㷨£¨Ä£© + * @param city + * @param address + * @param category + * @param useMap + * @return + */ + JSONObject newMatch(String city, String address, String category, boolean useMap ); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java index ce98de284..a7ef5db02 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java @@ -866,6 +866,35 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme } } + @Override + public JSONObject newMatch(String city, String address, String category, boolean useMap ){ + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", city); + params.put("address", address); + if(StringUtils.isNotBlank(category)){ + params.put("category", category); + } + + params.put("useMap", String.valueOf(useMap)); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null && json.size()>0) { + return (JSONObject)json; + } + return null; + } + + public void setHouseLoudongService(HouseLoudongService houseLoudongService) { this.houseLoudongService = houseLoudongService; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatService.java index 248c24f17..9098abe9f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatService.java @@ -99,6 +99,15 @@ public interface DistrictSellStatService { * @return */ Long findCityMarkDownDistrictCount(String city); - + + + /** + * ²éÕÒ×îÐÂһÆڵÄÔ¶ÈÔö¼Û + * @param city + * @param region + * @param name + * @return + */ + DistrictSellStat findFirstByParams(String city, String region,String name); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatServiceImpl.java index cd820055b..b42369813 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictSellStatServiceImpl.java @@ -219,4 +219,17 @@ public class DistrictSellStatServiceImpl implements DistrictSellStatService { params.add(new QueryParam("mom", QueryParam.LESS_THAN_OPERATOR, 0)); return districtSellStatDao.findCountByParams(params); } + + @Override + public DistrictSellStat findFirstByParams(String city, String region,String name) { + List queryParams = ImmutableList.of( + new QueryParam("city", city), + new QueryParam("region", region), + new QueryParam("districtName", name) + ); + List sortParams = ImmutableList.of( + new SortParam("date", false) + ); + return districtSellStatDao.findFirstByParams(queryParams, sortParams); + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index 238c968db..f6d2dc833 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2014,6 +2014,13 @@ public class DistrictServiceImpl implements DistrictService { if (city == null){ return null; } + if(RegionData.isRegion(city, region)){ + region = RegionData.formatRegion(city, region); + } + if(region == null){ + return null; + } + District districtInfo = findDistrict(new DistrictKey(city, region, name), target); // ÏȾ«ȷ²éѯ£¬²鲻µ½Ôٸù¾ݱðÃûƥÅä if (districtInfo != null) { @@ -2449,6 +2456,7 @@ public class DistrictServiceImpl implements DistrictService { List params = new ArrayList(); params.add(new QueryParam("category", "district")); params.add(new QueryParam("city", district.getCity())); + params.add(new QueryParam("estateType2", district.getEstateType2())); params.add(new QueryParam("visible", 0)); SdQuery sdQuery = new SdQuery(); sdQuery.setPoint((double) district.getLat() / 10000000000.0 + "," + (double) district.getLng() / 10000000000.0); @@ -2456,7 +2464,7 @@ public class DistrictServiceImpl implements DistrictService { sdQuery.setDistance(String.valueOf((double) radiusMeters / 1000.0)); params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); List list = districtDao.findAllByParams(params, null, 0, limit * 2, - new String[] { "city", "region", "name", "estateType2", "id" }); + new String[] { "city", "region", "name", "estateType2", "id","lat","lng" }); if (list.isEmpty()) { return Collections.emptyList(); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java index 1b112e38c..3bcf1649a 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseService.java @@ -8,6 +8,7 @@ import java.util.Map; import com.fangjia.dal.FacetQuery; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.datastore.model.RentHouse; +import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.datastore.driver.FacetResult; import com.fangjia.service.bo.HousePDSBo; import com.fangjia.service.bo.HouseScorer; @@ -473,5 +474,32 @@ public interface HouseService extends ModeService { List findNearestHasHouseByLocation(String city, Double lat, Double lng, String cat, int radiusMeters, int limit); + /** + * ²éѯ×ÔÉí·¿Դ + * @param district + * @param cat + * @param startTime + * @param endTime + * @param startPrie + * @param endPrice + * @param pager + * @return + */ + List findSelfHouseByParams(District district, String cat, Integer startTime, Integer endTime, Integer startPrie, Integer endPrice, String estateType, Pager pager); + + /** + * ¸ù¾ݾ­γ¶ȲéÖܱßÑù±¾ + * @param lng + * @param lat + * @param startTime + * @param endTime + * @param startPrie + * @param endPrice + * @param pager + * @param radius + * @return + */ + List findArroundHouseByParams(String cat, Double lng, Double lat, Integer startTime, Integer endTime, Integer startPrie, Integer endPrice, String estateType, Pager pager, Integer radius); + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java index 5eb20dfea..ec788a71c 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/HouseServiceImpl.java @@ -11,16 +11,18 @@ import com.fangjia.dal.datastore.model.House; import com.fangjia.dal.datastore.model.RentHouse; import com.fangjia.dal.mongo.dao.UserHouseDao; import com.fangjia.dal.mongo.fangjia.model.ServerArea; +import com.fangjia.dal.mongo.model.DistrictStat; +import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap; import com.fangjia.dal.mongo.model.UserHouse; +import com.fangjia.dal.mongo.model.bkoff.DealPrice; +import com.fangjia.dal.seawater.dao.SeawaterDao; +import com.fangjia.dal.seawater.model.Seawater; import com.fangjia.dal.seaweed.model.District; import com.fangjia.datastore.driver.DSCollection; import com.fangjia.datastore.driver.DataStore; import com.fangjia.datastore.driver.FacetResult; import com.fangjia.service.api.KnowbaseService; -import com.fangjia.service.bo.HouseBo; -import com.fangjia.service.bo.HousePDSBo; -import com.fangjia.service.bo.HouseScorer; -import com.fangjia.service.bo.KnowbaseBo; +import com.fangjia.service.bo.*; import com.fangjia.service.common.SellSimilar; import com.fangjia.service.datastore.bean.HouseQueryBean; import com.fangjia.service.district.DistrictStatService; @@ -31,6 +33,7 @@ import com.fangjia.service.menu.Menu; import com.fangjia.service.mode.ModeEnum; import com.fangjia.service.mongo.fangjia.MetroService; import com.fangjia.service.query.QueryBean; +import com.fangjia.service.util.CommonUtils; import com.fangjia.service.util.ServiceUtil; import com.fangjia.service.util.SitenameUtil; import com.fangjia.service.web.MenuService; @@ -38,6 +41,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import org.apache.commons.lang.StringUtils; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; @@ -83,7 +87,9 @@ public class HouseServiceImpl implements HouseService { * ·¿ԴÑù±¾¹À¼ۼò½àģʽ¼ìË÷ÊôÐÔ */ private static final String[] SAMPLE_COMPACT = {"id", "city", "region", "districtName", "name", "area", "hall", "room", "toilet", "floor", "height", "direction", "fitment", "totalPrice", "url", "publishDate" }; - + + public static String[] TAGS = new String[]{"¶À¶°", "ÁªÅÅ", "µþ¼Ó", "˫ƴ", "»¨԰Ãæ»ý", "Ӿ³Ø", "±ðÊû", "´ø»¨԰", "Ñó·¿", "µþƴ", "¶ÀԺ", "ÁªÌå", "΢Êû", "´óƽÊû"}; + private HouseDao houseDao; private PicService picService; private DistrictService districtService; @@ -94,6 +100,7 @@ public class HouseServiceImpl implements HouseService { private BoostQueryPolicy boostQueryInformationPolicy; private UserHouseDao userHouseDao; private DistrictStatService districtStatService; + private SeawaterDao seawaterDao; public FacetQueryResult randomGainHouse(HouseQueryBean queryBean, int count) { long totalCount = this.findHouseCount(queryBean); @@ -2635,4 +2642,239 @@ public class HouseServiceImpl implements HouseService { return list; } + + @Override + public List findSelfHouseByParams(District district, String cat, Integer startTime, Integer endTime, Integer startPrie, Integer endPrice, String estateType, Pager pager) { + SeawaterQuery query = new SeawaterQuery(); + // ÏÈÓÃÃû×ֲé×ÔÉíµÄÑù±¾ + query.setCityDisplay(district.getCity()); + query.setRegion(district.getRegion()); + query.setDistrictName(district.getName()); + query.setCat(cat); + query.setStartDate(startTime); + query.setEndDate(endTime); + if(StringUtils.isNotBlank(estateType)){ + query.setEstateType(estateType); + } + + if (startPrie != null) { + query.setStartPrice(startPrie); + } + if(endPrice != null){ + query.setEndPrice(endPrice); + } + query.setPager(pager); + query.setSortField("p_date"); + query.setOrder(false); + query.setTable("latest_seawater"); +// if(StringUtils.isNotBlank(estateType)){ + List seawaters = seawaterDao.findSeawatersByQuery(query); + List houses = new ArrayList(); + for(Seawater s : seawaters){ + if(StringUtils.isNotBlank(district.getEstateType2())){ + if (district.getEstateType2().equals("ÆÕͨסլ")) {//01:ÆÕͨסլ 02:±ðÊû + if (StringUtils.isNotBlank(s.getEstateType()) && s.getEstateType().contains("±ðÊû")) { + continue; + } + if (isVilla(s.getArea(), s.getName(), s.getHeight(), s.getRoom())) { + continue; + } + houses.add(s); + } else if (district.getEstateType2().equals("±ðÊû")) { + if (s.getHeight() != null && s.getHeight() >= 10) { + continue; + } + if (s.getFloor() != null && s.getFloor() >= 10) { + continue; + } + if (s.getArea()<=150) { + continue; + } + houses.add(s); + } + } + } + return houses; +// } +// return seawaterDao.findSeawatersByQuery(query); + } + + @Override + public List findArroundHouseByParams(String cat, Double lng, Double lat, Integer startTime, Integer endTime, Integer startPrie, Integer endPrice, String estateType, Pager pager, Integer radius) { + SeawaterQuery query = new SeawaterQuery(); + query.setLat(lat); + query.setLng(lng); + query.setRadius(radius); + + query.setCat(cat); + query.setStartDate(startTime); + query.setEndDate(endTime); + + if (startPrie != null) { + query.setStartPrice(startPrie); + } + if(endPrice != null){ + query.setEndPrice(endPrice); + } + if(StringUtils.isNotBlank(estateType)){ + query.setEstateType(estateType); + } + query.setPager(pager); + query.setSortField("p_date"); + query.setOrder(false); + query.setTable("latest_seawater"); + + return seawaterDao.findSeawatersByQuery(query); + } + + /** + * + * @param estateType Óû§²éѯÎïҵÀàÐÍ + * @param startDate + * @return + */ + private List findByDistrict(District district, List keys, List names, Date startDate, Integer startPrice, Integer endPrice) { + + //¸ÄΪ´ÓES ²鷿Դ + ArrayList districtNames = new ArrayList(); + BooleanQuery nameQuery = new BooleanQuery(); + int c = 0; + for (String namekey : keys) { + if (StringUtils.isNotBlank(namekey)) { + namekey = ClientUtils.escapeQueryChars(namekey); + if (namekey.contains("_")) { + districtNames.add(namekey.split("_")[0]); + } + c++; + nameQuery.add(new TermQuery(new Term("districtname_key", namekey)), BooleanClause.Occur.SHOULD); + } + } + + List samples = new ArrayList(); + List nolianjiaSamples = new ArrayList(); + + List houseQuery = new ArrayList(); + houseQuery.add(new QueryParam("city", district.getCity())); + houseQuery.add(new QueryParam("region", district.getRegion())); + SeawaterQuery seawaterQuery = new SeawaterQuery(); + if (startPrice!=null && startPrice>0) { + houseQuery.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startPrice)); + } + if(endPrice!=null && endPrice>0){ + houseQuery.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, endPrice)); + } + + if (nameQuery.clauses().isEmpty()) { + return samples; + } + BooleanQuery srQuery = new BooleanQuery(); + srQuery.add(nameQuery, BooleanClause.Occur.MUST); + houseQuery.add(new QueryParam("$sr", new SrQuery(srQuery))); + if (startDate != null) { + houseQuery.add(new QueryParam("publishDate", QueryParam.GREATER_THAN_OPERATOR, startDate)); + } + + List houseSortParams = new ArrayList(); + houseSortParams.add(new SortParam("publishDate", false)); + + seawaterQuery.setCityDisplay(district.getCity()); + seawaterQuery.setDistrictAlias(names); + seawaterQuery.setRegion(district.getRegion()); + seawaterQuery.setDistrictName(district.getName()); + + seawaterQuery.setSortField("p_date"); + seawaterQuery.setOrder(false); + Pager pager = new Pager(0, 200); + pager.setPageSize(200); + seawaterQuery.setTable("latest_seawater"); + seawaterQuery.setPager(pager); + seawaterQuery.setCat("sell"); + List seawaters = seawaterDao.findSeawatersByQuery(seawaterQuery); + List houses = CommonUtils.transformListV(House.class, seawaters); + + int height = 0; + int maxFloor = 0; + boolean allSampleHasHeight = true; + for (House house : houses) { + if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("ÆÕͨסլ")) {//01:ÆÕͨסլ 02:±ðÊû + if (StringUtils.isNotBlank(house.getEstateType()) && house.getEstateType().contains("±ðÊû")) { + continue; + } + if (isVilla(house.getArea(), house.getName(), house.getHeight(), house.getRoom())) { + continue; + } + } else if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().equals("±ðÊû")) { + if (house.getHeight() != null && house.getHeight() >= 10) { + continue; + } + if (house.getFloor() != null && house.getFloor() >= 10) { + continue; + } + } + + SampleWrapper sample = null;//convertHouse2Sample(house); + if (isAvailableSample(sample)) { + if (house.getUrl().contains("lianjia.com") || house.getUrl().contains("ke.com")) { + samples.add(sample); + } else { + nolianjiaSamples.add(sample); + } + } + + + } + + return samples; + } + + /** + * ÅжÏÑù±¾ÊǷñ¿ÉÓà + * + * @param sample + * @return + */ + private boolean isAvailableSample(SampleWrapper sample) { + if (sample.getStrctureArea() > 500 || sample.getStrctureArea() < 10) { + return false; + } + + return true; + } + + /** + * ÊǷñÊDZðÊû + * + * @return + */ + public boolean isVilla(Double area, String name, Integer height, Integer room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + + public void setSeawaterDao(SeawaterDao seawaterDao) { + this.seawaterDao = seawaterDao; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java index 70d7fa37f..0e0648ab9 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java @@ -197,9 +197,6 @@ public class OfficeServiceImpl implements OfficeService { params.add(new QueryParam("city", evaluation.getCity())); params.add(new QueryParam("district", evaluation.getRegion())); params.add(new QueryParam("name", evaluation.getDistrictName())); - // »ñȡÉϸöÔÂyyyyMMÈÕÆÚ - String date = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -2), "yyyyMM"); - params.add(new QueryParam("date", Integer.parseInt(date))); // °´ÈÕÆڽµÐòÅÅÐò£¬ȡ×îеÄÊý¾ݣ¬¿ÉÄÜÉÏÔ»¹δ¸üУ¬ÔòȡÉÏÉϸöÔµÄÊý¾Ý List sortParams = new ArrayList(); @@ -207,7 +204,15 @@ public class OfficeServiceImpl implements OfficeService { // µڶþ²½£º»ù׼¼Û*¥²ãϵÊý*װÐÞϵÊý*³¯ÏòϵÊý OfficeRentStat officeRentStat = officeRentStatDao.findFirstByParams(params); - Double avgPrice = officeRentStat.getAvgPrice(); +// if(officeRentStat == null){ +// // »ñȡÉϸöÔÂyyyyMMÈÕÆÚ +// String date = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -1), "yyyyMM"); +// params.add(new QueryParam("date", Integer.parseInt(date))); +// } + Double avgPrice = null; + if(officeRentStat != null){ + avgPrice = officeRentStat.getAvgPrice(); + } if (avgPrice != null) { Double factor = 1.0; if (evaluation.getFitment() != null) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java index fbd4dd7ea..4caf96ee2 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceService.java @@ -69,6 +69,8 @@ public interface DealPriceService { */ public List findDealPrices(List params, int max); + public List findDealPrices(String id, int max, Integer startPrice, Integer endPrice, Date startDate, Date endDate); + public Integer findDealPrices(String city, String region, String districtName, Date startDate, Date endDate); public List findDealPriceList(String city, String region, String districtName, Date startDate, diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java index 8a93f201e..300dca8f6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DealPriceServiceImpl.java @@ -180,6 +180,33 @@ public class DealPriceServiceImpl implements DealPriceService { "tradeDate", "source", "room", "hall", "toilet", "height", "floor","direction" }); } + @Override + public List findDealPrices(String id, int max, Integer startPrice, Integer endPrice, Date startDate, Date endDate) { + List params = new ArrayList(); + params.add(new QueryParam("tradeDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, DateUtil.add(new Date(), -6))); + params.add(new QueryParam("matchId", id)); + if(startPrice!=null && startPrice>0){ + params.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startPrice)); + } + if(startPrice!=null && startPrice>0){ + params.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, endPrice)); + } + + if(startDate!=null){ + params.add(new QueryParam("tradeDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate)); + } + if(endDate!=null){ + params.add(new QueryParam("tradeDate", QueryParam.LESS_THAN_EQUAL_OPERATOR, endDate)); + } + + + List sortParams = new ArrayList(); + sortParams.add(new SortParam("tradeDate", false)); + return dealPriceDao.findAllByParams(params, sortParams, 0, max, + new String[] { "city", "region", "districtName", "avgPrice", "fitment", "area", "totalPrice", + "tradeDate", "source", "room", "hall", "toilet", "height", "floor","direction" }); + } + @Override public Integer findDealPrices(String city, String region, String districtName, Date startDate, Date endDate) { List params = new ArrayList(); From 7b0125d7a78f259d3db1e04f7d8ec3fb3fc7a282 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 18 Dec 2025 15:23:04 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-coresite/src/main/webapp/about/contact.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/ad/introduce.ftl | 2 +- .../src/main/webapp/addressAnaly/dialog.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/alidata/download.ftl | 2 +- projects/fangjia-coresite/src/main/webapp/api/all.ftl | 2 +- .../fangjia-coresite/src/main/webapp/api/budongchan.ftl | 2 +- .../fangjia-coresite/src/main/webapp/api/dianzhifenxi.ftl | 2 +- .../fangjia-coresite/src/main/webapp/api/jiazhifenxi.ftl | 2 +- .../fangjia-coresite/src/main/webapp/api/testApply.ftl | 4 ++-- .../src/main/webapp/api/yapinfengkong.ftl | 2 +- projects/fangjia-coresite/src/main/webapp/app/index.ftl | 2 +- projects/fangjia-coresite/src/main/webapp/beans/done.ftl | 2 +- .../fangjia-coresite/src/main/webapp/company/about.ftl | 6 +++--- .../fangjia-coresite/src/main/webapp/daikuan/fail.ftl | 2 +- .../fangjia-coresite/src/main/webapp/daikuan/show.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/diaoyudao/index.ftl | 2 +- .../src/main/webapp/evaluation/checkUser.ftl | 2 +- .../src/main/webapp/evaluation/loan_apply.ftl | 2 +- .../src/main/webapp/evaluation/reportNew.ftl | 2 +- .../fangjia-coresite/src/main/webapp/footer/footer.ftl | 2 +- .../src/main/webapp/footer/introduceFooter.ftl | 2 +- .../src/main/webapp/footer/simpleFooter.ftl | 4 ++-- .../src/main/webapp/footer/simpleFooterNew.ftl | 4 ++-- projects/fangjia-coresite/src/main/webapp/gjs/index.ftl | 2 +- .../fangjia-coresite/src/main/webapp/header/header.ftl | 4 ++-- .../src/main/webapp/header/v2/_footer.ftl | 2 +- .../src/main/webapp/header/v5/_footer.ftl | 6 +++--- .../src/main/webapp/header/v5/_footer2.ftl | 4 ++-- .../src/main/webapp/header/v5/contact.ftl | 2 +- .../fangjia-coresite/src/main/webapp/header/v5/index.ftl | 6 +++--- .../src/main/webapp/header/v5/noBoxApp_footer.ftl | 4 ++-- .../src/main/webapp/header/v5/noFooterM_footer.ftl | 2 +- .../src/main/webapp/header/v6/_footer.ftl | 4 ++-- .../src/main/webapp/header/v6/float_wid.ftl | 2 +- .../fangjia-coresite/src/main/webapp/help/contactUs.ftl | 2 +- .../fangjia-coresite/src/main/webapp/help/friendLink.ftl | 2 +- .../src/main/webapp/industry/consulting.ftl | 2 +- .../fangjia-coresite/src/main/webapp/industry/cost.ftl | 2 +- .../fangjia-coresite/src/main/webapp/industry/itfin.ftl | 2 +- .../src/main/webapp/loanLeads/addSuccess.ftl | 2 +- .../src/main/webapp/loanLeads/success.ftl | 2 +- .../src/main/webapp/personalcenter/index.ftl | 4 ++-- .../src/main/webapp/personalcenter/rechargeHistory.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/recharge/buyList.ftl | 4 ++-- .../src/main/webapp/recharge/prechargePay.ftl | 6 +++--- .../src/main/webapp/recharge/rechargeList.ftl | 4 ++-- .../src/main/webapp/recharge/setPassword.ftl | 4 ++-- .../src/main/webapp/recharge/statement.ftl | 4 ++-- .../src/main/webapp/saleLeads/dataAbility.ftl | 2 +- .../src/main/webapp/saleLeads/didataApply.ftl | 2 +- .../src/main/webapp/saleLeads/didataResult.ftl | 2 +- .../fangjia-coresite/src/main/webapp/saleLeads/result.ftl | 2 +- .../fangjia-coresite/src/main/webapp/solution/card.ftl | 2 +- .../src/main/webapp/solution/location.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/solution/outlets.ftl | 2 +- .../fangjia-coresite/src/main/webapp/solution/paimai.ftl | 4 ++-- projects/fangjia-coresite/src/main/webapp/user/login.ftl | 2 +- .../fangjia-coresite/src/main/webapp/user/login_check.ftl | 2 +- .../fangjia-coresite/src/main/webapp/user/password.ftl | 2 +- .../fangjia-coresite/src/main/webapp/user/regSuccess.ftl | 2 +- .../fangjia-coresite/src/main/webapp/user/register.ftl | 2 +- .../src/main/webapp/user/reqUserLoginPage.ftl | 8 ++++---- .../src/main/webapp/user/reqUserRegPage.ftl | 6 +++--- .../src/main/webapp/user/reqUserResetPassPage.ftl | 4 ++-- .../fangjia-coresite/src/main/webapp/xingshang/regist.ftl | 2 +- .../src/main/webapp/jsp/fangjia/_footer.jsp | 2 +- .../src/main/webapp/jsp/fangshidai/_footer.jsp | 4 ++-- .../src/main/webapp/jsp/loan/house-loan-index.jsp | 2 +- 68 files changed, 101 insertions(+), 101 deletions(-) diff --git a/projects/fangjia-coresite/src/main/webapp/about/contact.ftl b/projects/fangjia-coresite/src/main/webapp/about/contact.ftl index da753c519..53ae27c93 100644 --- a/projects/fangjia-coresite/src/main/webapp/about/contact.ftl +++ b/projects/fangjia-coresite/src/main/webapp/about/contact.ftl @@ -28,12 +28,12 @@
上海估家网络科技有限公司
-
咨询热线: 4001883787
(周一至周五 09:00-18:00)
+
咨询热线: 021-62393138
(周一至周五 09:00-18:00)

上海总部

- 电  话: 4001883787(周一至周五 09:00-18:00)
+ 电  话: 021-62393138(周一至周五 09:00-18:00)
邮  箱: gujia@fangjia.com
地  址: 上海市长宁区协和路1033号文洋大厦B座10楼
邮  编: 200335

diff --git a/projects/fangjia-coresite/src/main/webapp/ad/introduce.ftl b/projects/fangjia-coresite/src/main/webapp/ad/introduce.ftl index 2d9a9968e..de93cd5e9 100644 --- a/projects/fangjia-coresite/src/main/webapp/ad/introduce.ftl +++ b/projects/fangjia-coresite/src/main/webapp/ad/introduce.ftl @@ -63,7 +63,7 @@
免费体验请联系: - 4001883787 + 021-62393138
diff --git a/projects/fangjia-coresite/src/main/webapp/addressAnaly/dialog.ftl b/projects/fangjia-coresite/src/main/webapp/addressAnaly/dialog.ftl index d441969a5..66f113c0c 100644 --- a/projects/fangjia-coresite/src/main/webapp/addressAnaly/dialog.ftl +++ b/projects/fangjia-coresite/src/main/webapp/addressAnaly/dialog.ftl @@ -44,7 +44,7 @@ -

您也可以直接联系商务,商务热线:4001883787

+

您也可以直接联系商务,商务热线:021-62393138

@@ -61,7 +61,7 @@ - 单次免费批量分析100条上海地址数据,如需分析超过100条数据或测试其他城市请联系商务:4001883787 + 单次免费批量分析100条上海地址数据,如需分析超过100条数据或测试其他城市请联系商务:021-62393138 diff --git a/projects/fangjia-coresite/src/main/webapp/alidata/download.ftl b/projects/fangjia-coresite/src/main/webapp/alidata/download.ftl index e1f816cc9..5741795e3 100644 --- a/projects/fangjia-coresite/src/main/webapp/alidata/download.ftl +++ b/projects/fangjia-coresite/src/main/webapp/alidata/download.ftl @@ -72,7 +72,7 @@

diff --git a/projects/fangjia-coresite/src/main/webapp/api/budongchan.ftl b/projects/fangjia-coresite/src/main/webapp/api/budongchan.ftl index c85afd432..732356ab5 100644 --- a/projects/fangjia-coresite/src/main/webapp/api/budongchan.ftl +++ b/projects/fangjia-coresite/src/main/webapp/api/budongchan.ftl @@ -86,7 +86,7 @@ diff --git a/projects/fangjia-coresite/src/main/webapp/api/dianzhifenxi.ftl b/projects/fangjia-coresite/src/main/webapp/api/dianzhifenxi.ftl index 7e593f544..1c03811e8 100644 --- a/projects/fangjia-coresite/src/main/webapp/api/dianzhifenxi.ftl +++ b/projects/fangjia-coresite/src/main/webapp/api/dianzhifenxi.ftl @@ -86,7 +86,7 @@ diff --git a/projects/fangjia-coresite/src/main/webapp/api/jiazhifenxi.ftl b/projects/fangjia-coresite/src/main/webapp/api/jiazhifenxi.ftl index d66d3a83b..580052a89 100644 --- a/projects/fangjia-coresite/src/main/webapp/api/jiazhifenxi.ftl +++ b/projects/fangjia-coresite/src/main/webapp/api/jiazhifenxi.ftl @@ -84,7 +84,7 @@ diff --git a/projects/fangjia-coresite/src/main/webapp/api/testApply.ftl b/projects/fangjia-coresite/src/main/webapp/api/testApply.ftl index ebd64a57e..faf58c105 100644 --- a/projects/fangjia-coresite/src/main/webapp/api/testApply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/api/testApply.ftl @@ -287,8 +287,8 @@
- 前台总机:021-62393138
- 客服热线:4001883787
+ 客服热线:021-62393138
+<#-- 客服热线:4001883787
--> 上海找房子,估房价,百度 房价网
电子邮箱:gujia@fangjia.com
diff --git a/projects/fangjia-coresite/src/main/webapp/api/yapinfengkong.ftl b/projects/fangjia-coresite/src/main/webapp/api/yapinfengkong.ftl index 869d4eab2..be0b19256 100644 --- a/projects/fangjia-coresite/src/main/webapp/api/yapinfengkong.ftl +++ b/projects/fangjia-coresite/src/main/webapp/api/yapinfengkong.ftl @@ -86,7 +86,7 @@ diff --git a/projects/fangjia-coresite/src/main/webapp/app/index.ftl b/projects/fangjia-coresite/src/main/webapp/app/index.ftl index bd01a269a..e22f3a1b6 100644 --- a/projects/fangjia-coresite/src/main/webapp/app/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/app/index.ftl @@ -258,7 +258,7 @@
-

400-188-3787

+

021-62393138

周一至周五 09:00-18:00
diff --git a/projects/fangjia-coresite/src/main/webapp/beans/done.ftl b/projects/fangjia-coresite/src/main/webapp/beans/done.ftl index ea6dc9d6c..6ffa1ebe3 100644 --- a/projects/fangjia-coresite/src/main/webapp/beans/done.ftl +++ b/projects/fangjia-coresite/src/main/webapp/beans/done.ftl @@ -40,7 +40,7 @@ 1.

请立即登陆会员中心或注册新会员,否则将无法得到房豆及相应奖励


2.感谢您的参与,请耐心等待人工审核
3.在房价网会员中心的“用户中心”可查看任务审核进度、房豆数量
- 4.如有疑问,欢迎拨打客服热线4001883787 + 4.如有疑问,欢迎拨打客服热线021-62393138 diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index 6867ffbf8..a7864e3d6 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -140,7 +140,7 @@
提供产品咨询与服务
-
+
(周一至周五 09:00-18:00)
@@ -159,7 +159,7 @@
提供产品咨询与服务
-
+
(周一至周五 09:00-18:00)
@@ -175,7 +175,7 @@
-
地址:上海市静安区江宁路212号凯迪克大厦1709室
+
地址:上海市长宁区金钟路658弄10号201-202室
邮箱:gujia@fangjia.com
邮编:200003
diff --git a/projects/fangjia-coresite/src/main/webapp/daikuan/fail.ftl b/projects/fangjia-coresite/src/main/webapp/daikuan/fail.ftl index 7e1a6b37c..77f77763e 100644 --- a/projects/fangjia-coresite/src/main/webapp/daikuan/fail.ftl +++ b/projects/fangjia-coresite/src/main/webapp/daikuan/fail.ftl @@ -37,7 +37,7 @@ 手  机:
-
或直接拨打客服热线:4001883787
+
或直接拨打客服热线:021-62393138
(服务时间:周一至周五9:00-18:00)
diff --git a/projects/fangjia-coresite/src/main/webapp/daikuan/show.ftl b/projects/fangjia-coresite/src/main/webapp/daikuan/show.ftl index 93a1fd772..043ef5745 100644 --- a/projects/fangjia-coresite/src/main/webapp/daikuan/show.ftl +++ b/projects/fangjia-coresite/src/main/webapp/daikuan/show.ftl @@ -125,7 +125,7 @@ 提 交
- 申请提交后该机构客户经理会在24小时内主动联系您,请耐心等待。
如有疑问请拨打客服热线:4001883787 + 申请提交后该机构客户经理会在24小时内主动联系您,请耐心等待。
如有疑问请拨打客服热线:021-62393138
@@ -195,7 +195,7 @@ $(document).ready(function(){ function(data){ data = eval("(" + data + ")"); if(data.msg == 'OK') { - showAlert("感谢您的申请,该机构客户经理会尽快联系您,谢谢!
客服热线:4001883787"); + showAlert("感谢您的申请,该机构客户经理会尽快联系您,谢谢!
客服热线:021-62393138"); $("#_sqForm").hide(); }else{ showAlert(data.msg); diff --git a/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl b/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl index 44575521d..03009c752 100644 --- a/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl @@ -85,7 +85,7 @@

diff --git a/projects/fangjia-coresite/src/main/webapp/evaluation/checkUser.ftl b/projects/fangjia-coresite/src/main/webapp/evaluation/checkUser.ftl index e9786ba7d..d47ee671f 100644 --- a/projects/fangjia-coresite/src/main/webapp/evaluation/checkUser.ftl +++ b/projects/fangjia-coresite/src/main/webapp/evaluation/checkUser.ftl @@ -65,7 +65,7 @@ 登录
或
-

如果您不是通过手机注册的用户,请直接致电客服找回密码
客服热线:4001883787

+

如果您不是通过手机注册的用户,请直接致电客服找回密码
客服热线:021-62393138

diff --git a/projects/fangjia-coresite/src/main/webapp/evaluation/loan_apply.ftl b/projects/fangjia-coresite/src/main/webapp/evaluation/loan_apply.ftl index 481c69d3c..1e7db029d 100644 --- a/projects/fangjia-coresite/src/main/webapp/evaluation/loan_apply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/evaluation/loan_apply.ftl @@ -60,7 +60,7 @@

您的申请已提交

稍后会有工作人员和您联系,请耐心等待!

- + 确认 diff --git a/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl b/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl index 34a2e10c4..b8bb39ffd 100644 --- a/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl +++ b/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl @@ -280,7 +280,7 @@
-

如有商务合作需求,请填写您的信息,我们的客服人员会尽快与您取得联系。您也可以拨打400-188-3787(周一至周五9:00-18:00)与我们联系。

+

如有商务合作需求,请填写您的信息,我们的客服人员会尽快与您取得联系。您也可以拨打021-62393138(周一至周五9:00-18:00)与我们联系。

diff --git a/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl b/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl index bae05243e..6a06ea6cb 100644 --- a/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl @@ -70,7 +70,7 @@

- 前台总机:021-62393138
- 客服热线:4001883787
+ 客服热线:021-62393138
+<#-- 客服热线:4001883787
--> 上海找房子,估房价,百度 房价网
电子邮箱:gujia@fangjia.com
diff --git a/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl b/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl index 9d2ffbb46..48856c9f9 100644 --- a/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl +++ b/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl @@ -18,8 +18,8 @@
- 前台总机:021-62393138
- 客服热线:4001883787
+<#-- 前台总机:021-62393138
--> + 客服热线:021-62393138
上海找房子,估房价,百度 房价网
电子邮箱:gujia@fangjia.com
diff --git a/projects/fangjia-coresite/src/main/webapp/gjs/index.ftl b/projects/fangjia-coresite/src/main/webapp/gjs/index.ftl index 6d99e4205..fd6e10bdb 100644 --- a/projects/fangjia-coresite/src/main/webapp/gjs/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/gjs/index.ftl @@ -193,7 +193,7 @@
请您填入准确信息,以便估价师能及时联络到您。
点击发送后,估价师将在24小时内主动联络您,请耐心等待,谢谢!

- 客服热线:4001883787 (工作日9:00-18:00) + 客服热线:021-62393138 (工作日9:00-18:00)
diff --git a/projects/fangjia-coresite/src/main/webapp/header/header.ftl b/projects/fangjia-coresite/src/main/webapp/header/header.ftl index ad4d77af2..90fa84a7e 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/header.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/header.ftl @@ -51,7 +51,7 @@
  • class="current">关于我们
  • @@ -70,7 +70,7 @@
    -

    400-188-3787

    +

    021-62393138

    周一至周五 09:00-18:00
    diff --git a/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl index 4c231568a..6fc5ee05e 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl @@ -198,7 +198,7 @@

    -

    客服热线:4001883787 电子邮箱:gujia@fangjia.com
    +

    客服热线:021-62393138 电子邮箱:gujia@fangjia.com
    ©2006-${now?string("yyyy")} 房价网 版权所有 沪ICP备10203734号-1
    "><#if (!serverAreaMap?exists && actionName == 'index')>${cityName}找房子,">估房价,百度 房价网

    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 fcda2fdf4..17bcb0e81 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -46,7 +46,7 @@
    -

    如想了解详情,请致电 400-188-3787 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    +

    如想了解详情,请致电 021-62393138 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    立即咨询
    -

    如想了解详情,请致电 400-188-3787 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    +

    如想了解详情,请致电 021-62393138 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    立即咨询
    diff --git a/projects/fangjia-coresite/src/main/webapp/solution/outlets.ftl b/projects/fangjia-coresite/src/main/webapp/solution/outlets.ftl index d5e59dcaa..23dbd1acb 100644 --- a/projects/fangjia-coresite/src/main/webapp/solution/outlets.ftl +++ b/projects/fangjia-coresite/src/main/webapp/solution/outlets.ftl @@ -77,7 +77,7 @@
    -

    如想了解详情,请致电 400-188-3787 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    +

    如想了解详情,请致电 021-62393138 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    立即咨询
    diff --git a/projects/fangjia-coresite/src/main/webapp/solution/paimai.ftl b/projects/fangjia-coresite/src/main/webapp/solution/paimai.ftl index 261a6ab84..27abd0d6c 100644 --- a/projects/fangjia-coresite/src/main/webapp/solution/paimai.ftl +++ b/projects/fangjia-coresite/src/main/webapp/solution/paimai.ftl @@ -157,12 +157,12 @@

    -

    如想获取您所关注城市的法拍房市场分析报告,或者查询任一楼盘的法拍成交折扣率,请致电  400-188-3787  联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    +

    如想获取您所关注城市的法拍房市场分析报告,或者查询任一楼盘的法拍成交折扣率,请致电  021-62393138  联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    立即体验

    -

    如想获取您所关注城市的法拍房市场分析报告,或者查询任一楼盘的法拍成交折扣率,请致电联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    +

    如想获取您所关注城市的法拍房市场分析报告,或者查询任一楼盘的法拍成交折扣率,请致电联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。

    立即体验
    diff --git a/projects/fangjia-coresite/src/main/webapp/user/login.ftl b/projects/fangjia-coresite/src/main/webapp/user/login.ftl index 254c8002f..76bf98520 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/login.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/login.ftl @@ -152,7 +152,7 @@
    或
    -

    如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:4001883787

    +

    如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:021-62393138

    diff --git a/projects/fangjia-coresite/src/main/webapp/user/login_check.ftl b/projects/fangjia-coresite/src/main/webapp/user/login_check.ftl index 55d4778a1..1d9156034 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/login_check.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/login_check.ftl @@ -66,7 +66,7 @@ 登录
    或
    -

    如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:4001883787

    +

    如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:021-62393138

    diff --git a/projects/fangjia-coresite/src/main/webapp/user/password.ftl b/projects/fangjia-coresite/src/main/webapp/user/password.ftl index 0ca8a83b7..5dcd0d9ac 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/password.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/password.ftl @@ -127,7 +127,7 @@
    或
    -

    如果您为非手机注册用户、海外用户或当前手机不用/丢失,
    请致电客服:4001883787

    +

    如果您为非手机注册用户、海外用户或当前手机不用/丢失,
    请致电客服:021-62393138

    diff --git a/projects/fangjia-coresite/src/main/webapp/user/regSuccess.ftl b/projects/fangjia-coresite/src/main/webapp/user/regSuccess.ftl index cd9b74e06..4088fff7e 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/regSuccess.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/regSuccess.ftl @@ -51,7 +51,7 @@

    感谢您的注册

    -

    若您有任何问题,欢迎拨打客服电话:400-188-3787

    +

    若您有任何问题,欢迎拨打客服电话:021-62393138

    diff --git a/projects/fangjia-coresite/src/main/webapp/user/register.ftl b/projects/fangjia-coresite/src/main/webapp/user/register.ftl index 6fce0e272..e1f33dfa5 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/register.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/register.ftl @@ -146,7 +146,7 @@
    或
    -

    若有任何问题,请致电客服:400-188-3787

    +

    若有任何问题,请致电客服:021-62393138

    diff --git a/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl b/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl index b44337846..f42cd6398 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl @@ -121,7 +121,7 @@ 手机绑定成功后,您可通过手机号码与原账号密码登录 - 海外用户请致电客服:4001883787 + 海外用户请致电客服:021-62393138 @@ -157,7 +157,7 @@ 返回 新用户注册 - 如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:4001883787
    + 如果您不是通过手机注册的用户,请直接致电客服找回密码
    客服热线:021-62393138
    @@ -103,8 +103,8 @@
    - 前台总机:021-62393138
    - 客服热线:4001883787
    +<#-- 前台总机:021-62393138
    --> + 客服热线:021-62393138
    上海找房子,估房价,百度 房价网
    电子邮箱:gujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl b/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl index 1f6145775..adc215c12 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl @@ -52,7 +52,7 @@ 想起密码请直接登录 - 如果您为非手机注册用户、海外用户或当前手机不用/丢失,请致电客服:4001883787 + 如果您为非手机注册用户、海外用户或当前手机不用/丢失,请致电客服:021-62393138 @@ -73,7 +73,7 @@
    前台总机:021-62393138
    - 客服热线:4001883787
    +<#-- 客服热线:4001883787
    --> 上海找房子,估房价,百度 房价网
    电子邮箱:gujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl b/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl index a2c4ee406..74890b771 100644 --- a/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl +++ b/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl @@ -123,7 +123,7 @@ 热门品牌

    diff --git a/projects/fangjia-static/src/main/webapp/jsp/fangshidai/_footer.jsp b/projects/fangjia-static/src/main/webapp/jsp/fangshidai/_footer.jsp index d9a2ed8c4..05f7696fe 100644 --- a/projects/fangjia-static/src/main/webapp/jsp/fangshidai/_footer.jsp +++ b/projects/fangjia-static/src/main/webapp/jsp/fangshidai/_footer.jsp @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/projects/fangjia-static/src/main/webapp/jsp/loan/house-loan-index.jsp b/projects/fangjia-static/src/main/webapp/jsp/loan/house-loan-index.jsp index 734bc33c2..14c2ad9aa 100644 --- a/projects/fangjia-static/src/main/webapp/jsp/loan/house-loan-index.jsp +++ b/projects/fangjia-static/src/main/webapp/jsp/loan/house-loan-index.jsp @@ -39,7 +39,7 @@ 替您量身搜索合适的银行产品
    直接电话联系银行业务人员
    让您贷款不再费劲
    - 房价网客服:4001883787

    + 房价网客服:021-62393138

    From 34b90844c51d522cc7c5b439d801fbb3e125ef1e Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 19 Dec 2025 10:09:35 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E6=88=BF=E6=BA=90?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9=E5=8F=8A=E5=B9=B3=E7=B1=B3?= =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=8E=A5=E5=8F=A3=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/HouseController.java | 42 +++++++++++-------- .../controllers/SqmetreRentController.java | 6 ++- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index dc37725aa..516d54bd4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -975,6 +975,21 @@ public class HouseController { mav.setModel(BasicModel.buildBadRequestModel("·ÇÖйú¾­γ¶È")); return mav; } + + List houses = new ArrayList(); + List houseSelf = new ArrayList(); + List houseAround = new ArrayList(); + List houseList = new ArrayList(); +// if (cat.contains("_")) { + // ÉÌÆ̣¬д×Ö¥Óо­γ¶ȣ¬ֱ½Ӳé + SeawaterQuery query = new SeawaterQuery(); + // ÏÈÓÃÃû×ֲé×ÔÉíµÄÑù±¾ + query.setCityDisplay(city); + query.setRegion(region); + query.setDistrictName(districtName); + query.setStartDate(model.getStartTime()); + query.setEndDate(model.getEndTime()); + String category = "district"; if ("1".equals(model.getPropertyType())) { category = "office"; @@ -991,6 +1006,11 @@ public class HouseController { } else { cat = "rent"; } + if (model.getPrice() != null) { + query.setStartPrice((int) (model.getPrice() * 0.9 * 30)); + query.setEndPrice((int) (model.getPrice() * 1.1 * 30)); + } + } else { if ("1".equals(model.getPropertyType())) { cat = "office_sell"; @@ -998,21 +1018,13 @@ public class HouseController { if ("2".equals(model.getPropertyType())) { cat = "shop_sell"; } + if (model.getPrice() != null) { + query.setStartPrice((int) (model.getPrice() * 0.9)); + query.setEndPrice((int) (model.getPrice() * 1.1)); + } + } - List houses = new ArrayList(); - List houseSelf = new ArrayList(); - List houseAround = new ArrayList(); - List houseList = new ArrayList(); -// if (cat.contains("_")) { - // ÉÌÆ̣¬д×Ö¥Óо­γ¶ȣ¬ֱ½Ӳé - SeawaterQuery query = new SeawaterQuery(); - // ÏÈÓÃÃû×ֲé×ÔÉíµÄÑù±¾ - query.setCityDisplay(city); - query.setRegion(region); - query.setDistrictName(districtName); query.setCat(cat); - query.setStartDate(model.getStartTime()); - query.setEndDate(model.getEndTime()); if (model.getSize() != null && model.getSize() != 0) { query.setStartArea(model.getSize() * 0.9); @@ -1025,10 +1037,6 @@ public class HouseController { } else { pager.setPageSize(5); } - if (model.getPrice() != null) { - query.setStartPrice((int) (model.getPrice() * 0.9)); - query.setEndPrice((int) (model.getPrice() * 1.1)); - } query.setPager(pager); query.setSortField("p_date"); query.setOrder(false); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java index d00eb39d5..17c168e00 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/SqmetreRentController.java @@ -1,6 +1,7 @@ package com.fangjia.open.controllers; import com.fangjia.core.RegionData; +import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.DateUtil; import com.fangjia.dal.mongo.model.SqmetreRent; import com.fangjia.dal.seaweed.model.District; @@ -232,7 +233,8 @@ public class SqmetreRentController { item.put("district", sqmetreRent.getRegion()); item.put("name", sqmetreRent.getDistrictName()); Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0; - item.put("rent", currentRent); + Double dayRentPrice = currentRent/30.0; + item.put("rent", DataUtil.getRound(2, dayRentPrice)); item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "δ֪ÈÕÆÚ"); // ¼ÆËãÔÂÕǷù @@ -249,7 +251,7 @@ public class SqmetreRentController { } // ÉèÖ÷µ»ؽá¹û£¬·Àֹ subList Խ½ç - if (result.size() > 1) { + if (result.size() > 0) { mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size()))); } else { mav.setModel(BasicModel.buildOKModel().setResult(null)); From 9eb7f0710ab4b0565a69dd1c17c6b3a714cceccd Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 19 Dec 2025 14:47:05 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E6=88=BF=E6=BA=90?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8D=95=E4=BD=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/dal/seawater/model/Seawater.java | 6 +++--- .../open/controllers/HouseController.java | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index db70eae13..3bb471310 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -66,7 +66,7 @@ public class Seawater implements SeawaterEntity { private String url; private String root; private Integer avgPrice; - private Integer unitPrice; + private Number unitPrice; private String purpose; private String estateType; private String buildType; @@ -458,11 +458,11 @@ public class Seawater implements SeawaterEntity { this.maxFloor = maxFloor; } - public Integer getUnitPrice() { + public Number getUnitPrice() { return unitPrice; } - public void setUnitPrice(Integer unitPrice) { + public void setUnitPrice(Number unitPrice) { this.unitPrice = unitPrice; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 516d54bd4..bb3602076 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -57,6 +57,7 @@ import com.fangjia.service.sql.ApiUserService; import com.fangjia.service.sql.UserService; import com.fangjia.service.web.MenuService; import net.sf.json.JSONObject; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; import org.sothis.core.util.Closure; @@ -980,6 +981,7 @@ public class HouseController { List houseSelf = new ArrayList(); List houseAround = new ArrayList(); List houseList = new ArrayList(); + String[] categories = {"rent", "shop_rent", "office_rent"}; // if (cat.contains("_")) { // ÉÌÆ̣¬д×Ö¥Óо­γ¶ȣ¬ֱ½Ӳé SeawaterQuery query = new SeawaterQuery(); @@ -1043,6 +1045,9 @@ public class HouseController { query.setTable("latest_seawater"); if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(districtName)) { houseSelf = seawaterDao.findSeawatersByQuery(query); + for(Seawater house : houseSelf){ + house.setDistance(0); + } houses.addAll(houseSelf); } // Èç¹û×ÔÉíÑù±¾Êý²»¹»£¬ÔٲéÖܱß @@ -1088,7 +1093,15 @@ public class HouseController { } } seawater.setSize(house.getArea() == null || house.getArea() == 0 ? null : house.getArea()); - seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + if(ArrayUtils.contains(categories, cat)){ + if(house.getAvgPrice() != null){ + double dayRentPrice = (double)(house.getAvgPrice()/30.0); + seawater.setUnitPrice(DataUtil.getDoubleRound(2,dayRentPrice)); + } + }else{ + seawater.setUnitPrice(house.getAvgPrice() == null || house.getAvgPrice() == 0 ? null : house.getAvgPrice()); + } + seawater.setTotalPrice(house.getTotalPrice() == null || house.getTotalPrice() == 0 ? null : house.getTotalPrice()); seawater.setDirection(house.getDirection()); seawater.setFloor(house.getFloor() == null || house.getFloor() == 0 ? null : house.getFloor()); @@ -1096,7 +1109,7 @@ public class HouseController { // seawater.setRoom(house.getRoom() == null || house.getRoom() == 0 ? null : house.getRoom()); // seawater.setHall(house.getHall() == null || house.getHall() == 0 ? null : house.getHall()); // seawater.setToilet(house.getToilet() == null || house.getToilet() == 0 ? null : house.getToilet()); - seawater.setDayUnitPrice(house.getDayUnitPrice() == null || house.getDayUnitPrice() == 0 ? null : house.getDayUnitPrice()); +// seawater.setDayUnitPrice(house.getDayUnitPrice() == null || house.getDayUnitPrice() == 0 ? null : house.getDayUnitPrice()); seawater.setRentType(house.getRentType()); seawater.setPayType(house.getPayType()); seawater.setBusinessStatus(house.getBusinessStatus()); From c4f6cf660868fcc3fbd846f72cd873673c418ca6 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 19 Dec 2025 17:44:53 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=B7=E6=A0=BC=E6=94=B9=E4=B8=BA=E6=9C=88?= =?UTF-8?q?=E5=BA=A6=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 c4a7831bf..649ffb3d1 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 @@ -760,12 +760,14 @@ public class PropertyController { districtInfoDto.setAddress(district.getAddress()); //int avgPrice = districtStatService.findLatestDistrictAvgPrice(new DistrictKey(district), null); // ·µ»Ø2B¼۸ñ£¬С³ÌÐòÓã¬ÆäËûҲ¸ÄΪ2B - int avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), null); - if (avgPrice == 0) { - avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), DateUtil.add(new Date(), -7)); - } - if (avgPrice != 0) { - districtInfoDto.setAvgPrice(avgPrice); +// int avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), null); +// if (avgPrice == 0) { +// avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), DateUtil.add(new Date(), -7)); +// } + + DistrictSellStat sellStat = districtSellStatService.findFirstByParams(district.getCity(), district.getRegion(), district.getName()); + if (sellStat != null) { + districtInfoDto.setAvgPrice(sellStat.getAvgPrice()); } districtInfoDto.setPropertyType(district.getEstateType2()); if (district.getLat2() != null && district.getLat2() != 0 && district.getLng2() != null From e409e88fbc07ebc3041d01d5f66f21adcb490ef0 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Fri, 26 Dec 2025 09:59:29 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E7=B1=B3?= =?UTF-8?q?=E7=A7=9F=E9=87=91=E8=84=9A=E6=9C=AC=E9=92=89=E9=92=89=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../averager/InsertMonitorSquareRentCalcCommandBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy index c72b0288a..884f5a1e6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy @@ -153,7 +153,7 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { query.append("cat", "block") blockCount = SQMETRE_RENT_COLL.count(query) def msg = "±¾ÔÂ(${weekend.format("yyyyMM")})СÇøƽÃ××â½ð¼ÆËãÁ¿:".toString() + districtCount + ";±¾Ô³ÇÊÐƽÃ××â½ð¼ÆËãÁ¿:" + cityCount + ";±¾ÔÂÇøÓòƽÃ××â½ð¼ÆËãÁ¿:" + regionCount + ";±¾Ô°æ¿éƽÃ××â½ð¼ÆËãÁ¿:" + blockCount + ";ÔËÐÐʱ¼ä:" + secondToTime(time) + "." - sendDingDingMsg(TOKEN, msg) + sendDingDingMsg(TOKEN, msg, "13916076378") } /** * ¾ù¼ÛÊǷñ¼ÆËãÍê³É From 0f09380b841eb4db196b8a3ad66beb5d3d06e7f9 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Fri, 26 Dec 2025 13:28:32 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9MySQL=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-script/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 698a360f2..80cdd5037 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -597,10 +597,10 @@ - - mysql - mysql-connector-java - 8.0.33 - + + + + +