From 3b73c47a7181dca3f4065cae27e70535c081b3b5 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Wed, 6 Nov 2024 20:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sdklog=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../com/fangjia/script/wenyan/guojun.groovy | 50 +++++++++++++++++++ .../script/wenyan/xiamen/BankBounds.groovy | 15 ++++++ 3 files changed, 66 insertions(+) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/guojun.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/xiamen/BankBounds.groovy diff --git a/.gitignore b/.gitignore index b8a7398d0..187362488 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ deliverables/*/.idea /projects/fangjia-open/.idea *.idea* classes +**/sdklog/* diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/guojun.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/guojun.groovy new file mode 100644 index 000000000..e837ce0ba --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/guojun.groovy @@ -0,0 +1,50 @@ +package com.fangjia.script.wenyan + +import com.fangjia.core.ProvinceData +import com.fangjia.core.RegionData +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject +import org.bson.Document +import org.elasticsearch.action.get.GetRequest +import org.elasticsearch.action.get.GetResponse +import org.elasticsearch.client.RequestOptions +import org.elasticsearch.client.RestHighLevelClient + +////def data = [] +////data << ["ID","城市","区域","名称","地址", "财力评级"] +//RestHighLevelClient client = ElasticUtils.getClient89("192.168.0.89") +//district_analy_data_client = Mongo3Utils.getDbCollection("fangjia_stat", "district_analy_data") +//level_map = ["1": "S", "2": "A", "3": "B", "4": "C", "5": "D"] +//level_maps = new HashMap<>() +//for(def key in level_map.keySet()){ +// level_maps.put(level_map[key], key) +//} +//ExcelUtils.modify("C:\\Users\\goojia\\Desktop\\财力评级-厦门.xlsx",{List item-> +//// GetResponse response = client.get(new GetRequest("community_summary", item["A"] as String), RequestOptions.DEFAULT) +//// def query = new Document("city", item['B'].toString().replace("市", "")) +//// query.append("region", item['C'].replace("区", "")) +//// query.append("district_name", item["D"]) +//// def stat = district_analy_data_client.find(query).first() +//// println(query) +//// item["F"] = response.getSourceAsMap()?.consumption_rating +//// item["G"] = stat?.community_rating +// item["G"] = level_maps.get(item["G"], null) +//// println(item) +//}) +//System.exit(0) +////for (def region in ["思明", "翔安", "湖里"]) { +//// DbUtils.seaweed.find(new BasicDBObject("city", "厦门").append("region", region).append("cat", "district").append("status", 0)).each { BasicDBObject dbo -> +//// println("${dbo._id.toString()}\t${dbo.city}市\t${dbo.region}区\t${dbo.name}\t${dbo.address}") +//// } +////} + +ExcelUtils.read("C:\\Users\\goojia\\Desktop\\海南省城市均价.xlsx",1).each {List item-> + def yearMonth = DateUtil.formatByPattern(item[0], "yyyyMM").toInteger() + + println(item) +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/xiamen/BankBounds.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/xiamen/BankBounds.groovy new file mode 100644 index 000000000..3c5615061 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/xiamen/BankBounds.groovy @@ -0,0 +1,15 @@ +package com.fangjia.script.wenyan.xiamen + +import com.fangjia.core.util.DataUtil +import com.fangjia.core.util.GeoUtils +import com.fangjia.script.util.ExcelUtils + +ExcelUtils.multiThreadingModify("D:\\本地化部署\\厦门银行数据\\网点经纬度业务选择网点.xlsx",{List item -> + def location = item['E'] + if(location){ + def lng = location.toString().split(",")[0].toDouble() + def lat = location.toString().split(",")[1].toDouble() + def bounds = GeoUtils.getAround(lat, lng, 3000) + item["G"] = "${DataUtil.getRound(6, bounds[2])},${DataUtil.getRound(6,bounds[0])},${DataUtil.getRound(6,bounds[3])},${DataUtil.getRound(6,bounds[1])}" + } +}) From 3dee95286d41fc6df96ec8d9fe823498dcb0d745 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Thu, 7 Nov 2024 14:52:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 1 + .../fangjia/open/model/AddesssMatchModel.java | 9 ++++++++ .../address/AddressParserServiceImpl.java | 23 ++++++++++++++++++- .../fangjia/service/address/mode/Address.java | 9 ++++++++ .../service/address/mode/MatchParams.java | 10 +++++++- 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index a484fd8cf..d99ec101b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -619,6 +619,7 @@ public class AddressController { params.setProvince(model.getProvince()); params.setUseMap(model.isUseMap()); params.setDebugName(model.getDebugName()); + params.setPropertyType(model.getPropertyType()); long start = System.currentTimeMillis(); Building building = addressParserService.parser(params); long end = System.currentTimeMillis(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index 1a8907341..6feef4517 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -22,6 +22,7 @@ public class AddesssMatchModel extends FangjiaApiModel { private boolean useMap; private String address_1; private String address_2; + private String propertyType; private String showCode; @@ -153,4 +154,12 @@ public class AddesssMatchModel extends FangjiaApiModel { public void setShowCode(String showCode) { this.showCode = showCode; } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index c7c6b08a6..c9c7a6211 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -10,6 +10,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.bkoff.HouseLoudong; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.seaweed.dao.SeaweedDao; +import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.seaweed.model.Seaweed; import com.fangjia.service.address.mode.*; import com.fangjia.service.address.processor.AddressDistrictProcessors; @@ -436,8 +437,27 @@ public class AddressParserServiceImpl implements AddressParserService { AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); if(scoreResult.getResult().size() > 0){ AddressMatchMetaData matchedMate = scoreResult.getResult().get(0); + + if(matchedMate.getMetaDataType() == MetaDataType.CPDB){ - return new Building(districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate)); + District district = districtService.findById(matchedMate.getId(), MATCH_PROPERTY_FIELDS); + if("1".equals(addr.getPropertyType())){ + if(!district.getEstateType2().equals("别墅") || !district.getName().endsWith("别墅")){ + District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "别墅"), district.getCategory()); + if(districtNew != null){ + district = districtNew; + } + } + + }else if("2".equals(addr.getPropertyType())){ + if(!district.getEstateType2().equals("商住") || !district.getName().endsWith("商住楼")){ + District districtNew = districtService.findDistrict(new DistrictKey(district.getCity(), district.getRegion(), district.getName() + "商住楼"), district.getCategory()); + if(districtNew != null){ + district = districtNew; + } + } + } + return new Building(districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS), scoreResult.getScore(matchedMate)); }else{ return new Building(matchedMate, scoreResult.getScore(matchedMate)); } @@ -500,6 +520,7 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setProvince(params.getProvince()); addr.setDebugName(params.getDebugName()); addr.setUseMap(params.isUseMap()); + addr.setPropertyType(params.getPropertyType()); return AddressProcessors.process(addr); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 02cee4b25..d7cb876aa 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -15,6 +15,7 @@ import java.util.*; */ public class Address { + private String propertyType; private String province; private String city; private String district; @@ -769,6 +770,14 @@ public class Address { this.geoRegion = geoRegion; } + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } + @Override public String toString() { return "Address{" + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java index e53c9701f..bcff0e11b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java @@ -14,7 +14,7 @@ public class MatchParams { private String suggestName; /**调试时断点小区名*/ private String debugName; - + private String propertyType; /**用户输入地址*/ private String address; /**建筑类型解析出对应的建筑物*/ @@ -135,4 +135,12 @@ public class MatchParams { public void setDebugName(String debugName) { this.debugName = debugName; } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } }