From 40013fb01d60d85262f53002db587fbe73819695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Tue, 16 Mar 2021 11:58:46 +0800 Subject: [PATCH 01/16] update --- projects/fangjia-script/pom.xml | 5 ++ .../script/wenyan/temp/ClickHouseDemo.groovy | 69 +++++++++++++++++++ .../fangjia/script/wenyan/temp/Price.groovy | 21 +++--- 3 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 759a77240..ee00efea2 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -115,6 +115,11 @@ fangjia-datastore-driver 3.9.1 + + cc.blynk.clickhouse + clickhouse4j + 1.4.4 + redis.clients jedis diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy new file mode 100644 index 000000000..71df8ece9 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy @@ -0,0 +1,69 @@ +package com.fangjia.script.wenyan.temp + +import cc.blynk.clickhouse.copy.CopyManager +import cc.blynk.clickhouse.copy.CopyManagerFactory +import com.fangjia.core.util.DateUtil +import net.sf.json.JSONNull +import net.sf.json.JSONObject +import ru.yandex.clickhouse.ClickHouseConnection +import ru.yandex.clickhouse.ClickHouseDriver +import ru.yandex.clickhouse.settings.ClickHouseProperties + +import java.sql.PreparedStatement +import java.sql.Timestamp + +ClickHouseDriver clickHouseDriver = new ClickHouseDriver() +ClickHouseProperties clickHouseProperties = new ClickHouseProperties() +clickHouseProperties.connectionTimeout = 1000 * 3600 * 24 +clickHouseProperties.keepAliveTimeout = 1000 * 3600 * 24 +clickHouseProperties.dataTransferTimeout = 1000 * 3600 * 24 +clickHouseProperties.user = "default" +clickHouseProperties.password = "goojia123456" +ClickHouseConnection connection = clickHouseDriver.connect("jdbc:clickhouse://192.168.0.93:8123/fangjia", clickHouseProperties) +CopyManager copyManager = CopyManagerFactory.create(connection) +copyManager.copyFromDb("select * from fangjia.SEAWATER", "D://123.csv"); + + +//PreparedStatement sth = connection.prepareStatement("INSERT INTO SEAWATER(id,city,region,name,district_name,address,room,hall,toilet,area,avg_price,total_price ,floor_info,height,floor,direction,fitment,p_date,publish_date,c_date,m_date) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)") +//def cols = ["id", "city", "region", "name", "district_name", "address", "room", "hall", "toilet", "area", "avg_price", "total_price ", "floor_info", "height", "floor", "direction", "fitment", "p_date", "publish_date", "c_date", "m_date"] +//int count = 0 +//new File("D:\\建行测试数据").eachFile { def file -> +// file.eachLine("UTF-8", { def line -> +// String id = line.substring(0, line.indexOf("\t")) +// String jsonStr = line.substring(line.indexOf("\t") + 1) +// count++ +// JSONObject json = JSONObject.fromObject(jsonStr) +// json.put("id", id) +// for (int i = 0; i < cols.size(); i++) { +// if (cols[i].toString().endsWith("date") && "p_date" != cols[i]) { +// if ("c_date" == cols[i]) { +// if (json.get("m_date") instanceof Long) { +// sth.setTimestamp(i + 1, new Timestamp(json.get("m_date"))) +// } else { +// sth.setTimestamp(i + 1, new Timestamp(((Date) DateUtil.parseISODate(json.get("m_date"))).getTime())) +// +// } +// } else { +// if (json.get(cols[i]) instanceof String) { +// sth.setTimestamp(i + 1, new Timestamp(((Date) DateUtil.parseISODate(json.get(cols[i]))).getTime())) +// } else { +// sth.setTimestamp(i + 1, new Timestamp(json.get(cols[i]))) +// +// } +// } +// } else { +// if (json.get(cols[i]) instanceof JSONNull) { +// sth.setObject(i + 1, null) +// } else { +// sth.setObject(i + 1, json.get(cols[i])) +// } +// } +// } +// sth.addBatch() +// if (count % 30000 == 0) { +// sth.executeBatch() +// println(new Date().format("HH:mm:ss " + count)) +// } +// }) +//} +//sth.execute() \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Price.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Price.groovy index d314114dc..b245cfec6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Price.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/Price.groovy @@ -1,17 +1,16 @@ package com.fangjia.script.wenyan.temp -import com.fangjia.core.ProvinceData -import com.fangjia.core.RegionData -import com.fangjia.script.util.CommonUtils + import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject -ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\建行深开数据统计.xlsx",{List item-> - String city = RegionData.formatCity(item["A"]) - if(city){ - item["G"] = DbUtils.seaweed.count(DbUtils.buildSeaweedQuery(RegionData.formatCity(item["A"]))) - }else{ - item["G"] = null +def data = [["城市", "区域", "小区名", "别名", "地址", "地址别名"]] +["ID", "北京", "重庆", "哈尔滨"].each {def city-> + DbUtils.seaweed.find(DbUtils.buildSeaweedQuery(city)).each {BasicDBObject district-> + def item = [district._id.toString(), district.city, district.region, district.name, district.alias?.join(","), district.address, district.addr_alias?.join(",")] + println(item) + data << item } - -}) \ No newline at end of file +} +ExcelUtils.write("D:\\待抓取小区.xlsx", data, "数据") \ No newline at end of file From fdd9fc2a2caec1b75060c943cae1cd0eab6e8d32 Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 25 Mar 2021 10:53:59 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8E=BB=E6=8E=89=E5=9F=8E=E5=B8=82=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 4 ++-- 1 file changed, 2 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 b26aed431..0bbf5149c 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 @@ -1730,10 +1730,10 @@ public class AddressController { mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); return mav; } - if (StringUtils.isBlank(model.getCity())) { + /*if (StringUtils.isBlank(model.getCity())) { mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); return mav; - } + }*/ MatchParams matchParams = new MatchParams(); matchParams.setCity(model.getCity()); matchParams.setAddress(model.getAddress()); From 213330cfdda120db29a0c18680b9b11c047e3654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 25 Mar 2021 10:38:41 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9B=E5=B7=9D?= =?UTF-8?q?=E9=94=A6=E7=A8=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/gj/ccb/HouseExport.groovy | 6 +-- .../script/wenyan/temp/ClickHouseDemo.groovy | 35 +++++++++++----- .../wenyan/temp/SiChuanJingCheng.groovy | 42 +++++++++++++++++++ 3 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/HouseExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/HouseExport.groovy index 3c4ca8b31..84bf1edc9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/HouseExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/HouseExport.groovy @@ -78,11 +78,11 @@ class HouseExport { // exportRentCSV(city, districts, 20200201, 20210301, 2020); }else{ - exportRentCSV(city, districts, 20170801, 20181001, 2017) - exportRentCSV(city, districts, 20200201, 20210301, 2020); +// exportRentCSV(city, districts, 20170801, 20181001, 2017) +// exportRentCSV(city, districts, 20200201, 20210301, 2020); exportSellCSV(city, districts, 20170801, 20181001, 2017); - exportSellCSV(city, districts, 20200201, 20210301, 2020); +// exportSellCSV(city, districts, 20200201, 20210301, 2020); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy index 71df8ece9..5eed415f1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/ClickHouseDemo.groovy @@ -5,6 +5,7 @@ import cc.blynk.clickhouse.copy.CopyManagerFactory import com.fangjia.core.util.DateUtil import net.sf.json.JSONNull import net.sf.json.JSONObject +import org.bson.types.ObjectId import ru.yandex.clickhouse.ClickHouseConnection import ru.yandex.clickhouse.ClickHouseDriver import ru.yandex.clickhouse.settings.ClickHouseProperties @@ -12,16 +13,16 @@ import ru.yandex.clickhouse.settings.ClickHouseProperties import java.sql.PreparedStatement import java.sql.Timestamp -ClickHouseDriver clickHouseDriver = new ClickHouseDriver() -ClickHouseProperties clickHouseProperties = new ClickHouseProperties() -clickHouseProperties.connectionTimeout = 1000 * 3600 * 24 -clickHouseProperties.keepAliveTimeout = 1000 * 3600 * 24 -clickHouseProperties.dataTransferTimeout = 1000 * 3600 * 24 -clickHouseProperties.user = "default" -clickHouseProperties.password = "goojia123456" -ClickHouseConnection connection = clickHouseDriver.connect("jdbc:clickhouse://192.168.0.93:8123/fangjia", clickHouseProperties) -CopyManager copyManager = CopyManagerFactory.create(connection) -copyManager.copyFromDb("select * from fangjia.SEAWATER", "D://123.csv"); +//ClickHouseDriver clickHouseDriver = new ClickHouseDriver() +//ClickHouseProperties clickHouseProperties = new ClickHouseProperties() +//clickHouseProperties.connectionTimeout = 1000 * 3600 * 24 +//clickHouseProperties.keepAliveTimeout = 1000 * 3600 * 24 +//clickHouseProperties.dataTransferTimeout = 1000 * 3600 * 24 +//clickHouseProperties.user = "default" +//clickHouseProperties.password = "goojia123456" +//ClickHouseConnection connection = clickHouseDriver.connect("jdbc:clickhouse://192.168.0.93:8123/fangjia", clickHouseProperties) +//CopyManager copyManager = CopyManagerFactory.create(connection) +//copyManager.copyFromDb("select * from fangjia.SEAWATER", "D://123.csv"); //PreparedStatement sth = connection.prepareStatement("INSERT INTO SEAWATER(id,city,region,name,district_name,address,room,hall,toilet,area,avg_price,total_price ,floor_info,height,floor,direction,fitment,p_date,publish_date,c_date,m_date) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)") @@ -66,4 +67,16 @@ copyManager.copyFromDb("select * from fangjia.SEAWATER", "D://123.csv"); // } // }) //} -//sth.execute() \ No newline at end of file +//sth.execute() +def ids = new HashSet() +for(int i =0 ; i < 10000 * 10000; i++){ + if(i%10000 == 0){ + println(i) + } + def id = new ObjectId().toString() + if(ids.contains(id)){ + println(id) + }else{ + ids << id + } +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy new file mode 100644 index 000000000..c75c8611b --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy @@ -0,0 +1,42 @@ +package com.fangjia.script.wenyan.temp + +import com.fangjia.core.Constants +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.client.MongoCollection +import net.sf.json.JSONObject +import org.bson.Document + +import static com.mongodb.client.model.Filters.* + +MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") +def startDate = DateUtil.parseDate("20210201", "yyyyMMdd") +def endDate = DateUtil.parseDate("20210301", "yyyyMMdd") +Calendar calendar = Calendar.getInstance() +calendar.setTime(startDate) +def count = 0 +def hashSet = [] +def data = [["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg", "参数", "resMap"]] +while (startDate.before(endDate)) { + calendar.add(Calendar.DATE, 1) + def nextDate = calendar.getTime() + count++ + OPEN_URI_LOG.find(and(eq("user_id", "1007721"), eq("request_uri", "/property/evaluate3"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc -> + def result = JSONObject.fromObject(doc.res_map.result) + if(!result.buildYear || !result.avgPrice){ + return + } + def params = JSONObject.fromObject(doc.parameter_map) + def key = "${params.address}_${params.size}".toString() + if (!hashSet.contains(key)) { + def item = ["1007721", "scjc", doc.ip, doc.request_uri, doc.c_date, doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] + data << item + hashSet << key + } else { + println("已存在") + } + } + startDate = nextDate +} +ExcelUtils.write("D:\\四川锦城${startDate.format('yyyyMM')}.xlsx", data, "查询日志") \ No newline at end of file From f0a99e73aea5d06ebcfbaca0fd808e5810f3830c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 25 Mar 2021 14:20:13 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=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 | 15 +++++++++++++++ .../service/address/AddressParserServiceImpl.java | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 0bbf5149c..39f92dbbb 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 @@ -1755,6 +1755,21 @@ public class AddressController { dto.append("street", address.getStreet()); dto.append("streetNumber", address.getStreetNumber()); dto.append("name", building.getSuggestName()); + if(StringUtils.isBlank(building.getSuggestName())){ + if(StringUtils.isNotBlank(address.getParsedPropertyName())){ + dto.append("name", address.getParsedPropertyName()); + }else if(StringUtils.isNotBlank(address.getOrgKeywords())){ + dto.append("name", address.getOrgKeywords()); + } + } + if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ + String addr = building.getAddress(); + String street = AddressParserUtil.extractStreet(addr); + dto.append("street", street); + if(addr.length() != street.length()){ + dto.append("streetNumber", addr.replaceFirst(street, "")); + } + } dto.append("buildingNumber", address.getBuildingNumber()); dto.append("unitNumber", address.getUnitNumber()); dto.append("roomNumber", address.getRoomNumber()); 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 f9205e4b0..a586a0c66 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 @@ -860,9 +860,19 @@ public class AddressParserServiceImpl implements AddressParserService { formattedAddressBuilder.append(address.getStreetNumber()); } } + if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ + formattedAddressBuilder.append(building.getAddress()); + } if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){ formattedAddressBuilder.append(building.getSuggestName()); } + if(StringUtils.isBlank(building.getSuggestName())){ + if(StringUtils.isNotBlank(address.getParsedPropertyName())){ + formattedAddressBuilder.append(address.getParsedPropertyName()); + }else if(StringUtils.isNotBlank(address.getOrgKeywords())){ + formattedAddressBuilder.append(address.getOrgKeywords()); + } + } if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")){ if(StringUtils.isNotBlank(address.getStreetNumber())){ formattedAddressBuilder.append(address.getStreetNumber()); From a3ae325941fc635a1ec96b5b2b358010cfc7f923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 25 Mar 2021 17:12:05 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 8 +++++--- .../com/fangjia/service/address/AddressParserUtil.java | 2 +- 2 files changed, 6 insertions(+), 4 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 39f92dbbb..67dad1951 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 @@ -1765,9 +1765,11 @@ public class AddressController { if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ String addr = building.getAddress(); String street = AddressParserUtil.extractStreet(addr); - dto.append("street", street); - if(addr.length() != street.length()){ - dto.append("streetNumber", addr.replaceFirst(street, "")); + if(street != null){ + dto.append("street", street); + if(addr.length() != street.length()){ + dto.append("streetNumber", addr.replaceFirst(street, "")); + } } } dto.append("buildingNumber", address.getBuildingNumber()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java index dbc230c2d..e1f4b1338 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; */ public class AddressParserUtil { - static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街)"); + static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街|道|巷)"); static final Pattern CONNECTOR_PATTERN = Pattern.compile("~|-|~"); public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("\\d+(~|-|~)\\d+号"); static final Pattern SEPARATOR_PATTERN = Pattern.compile("、|,"); From c5b7e11f9136b1a0b9f11b59ccfa9a4d6e4973db Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 10:29:06 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 15 +- projects/fangjia-service/pom.xml | 10 ++ .../address/AddressParserServiceImpl.java | 69 +++++++- .../fangjia/service/address/mode/Address.java | 10 ++ .../service/address/mode/Building.java | 19 +++ .../service/address/mode/MatchParams.java | 22 +++ .../address/processor/CityProcessor.java | 11 +- .../fangjia/service/api/AliyunService.java | 7 + .../service/api/AliyunServiceImpl.java | 106 +++++++++++++ .../java/com/fangjia/service/bo/AliyunBo.java | 148 ++++++++++++++++++ .../mongo/addrepo/AddressRepoServiceImpl.java | 4 +- 11 files changed, 411 insertions(+), 10 deletions(-) create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunServiceImpl.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/bo/AliyunBo.java 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 67dad1951..483f228fc 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 @@ -1740,6 +1740,10 @@ public class AddressController { matchParams.setAddressParserGoal(AddressParserGoal.Match); matchParams.setPreciseLevel(PreciseLevel.STRICT); matchParams.setProvince(model.getProvince()); + +// matchParams.setUseMap(true); + matchParams.setUseAliyunApi(true); + matchParams.setExportLatAndLng(true); Building building = addressParserService.standard(matchParams); Address address = building.getSearchAddress(); UniversalDto dto = UniversalDto.newDto(); @@ -1768,7 +1772,12 @@ public class AddressController { if(street != null){ dto.append("street", street); if(addr.length() != street.length()){ - dto.append("streetNumber", addr.replaceFirst(street, "")); + dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr)); + } + }else if(StringUtils.isNotBlank(building.getStreet())){ + dto.append("street", building.getStreet()); + if(StringUtils.isNotBlank(building.getStreetno())){ + dto.append("streetNumber", building.getStreetno()); } } } @@ -1776,6 +1785,10 @@ public class AddressController { dto.append("unitNumber", address.getUnitNumber()); dto.append("roomNumber", address.getRoomNumber()); dto.append("formattedAddress", address.getFormattedAddress()); + if(matchParams.isExportLatAndLng()){ + dto.append("lat", building.getLat()); + dto.append("lng", building.getLng()); + } mav.setModel(BasicModel.buildOKModel().setResult(dto)); return mav; } diff --git a/projects/fangjia-service/pom.xml b/projects/fangjia-service/pom.xml index d88b516b0..b0f0ff8f8 100644 --- a/projects/fangjia-service/pom.xml +++ b/projects/fangjia-service/pom.xml @@ -214,5 +214,15 @@ jieba-analysis 1.0.2 + + com.aliyun + aliyun-java-sdk-address-purification + 1.0.0 + + + com.aliyun + aliyun-java-sdk-core + 4.5.19 + 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 a586a0c66..5531c7669 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 @@ -14,6 +14,8 @@ import com.fangjia.dal.seaweed.model.Seaweed; import com.fangjia.service.address.mode.*; import com.fangjia.service.address.processor.AddressDistrictProcessors; import com.fangjia.service.address.processor.AddressProcessors; +import com.fangjia.service.api.AliyunService; +import com.fangjia.service.bo.AliyunBo; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.mongo.addrepo.AddressRepoService; import com.fangjia.service.mongo.bkoff.HouseLoudongService; @@ -41,6 +43,7 @@ public class AddressParserServiceImpl implements AddressParserService { private HouseLoudongService houseLoudongService; private LoudongService loudongService; private SeaweedDao seaweedDao; + private AliyunService aliyunService; private final String[] MATCH_PROPERTY_FIELDS = new String[]{"id", "city", "region", "name", "address", "category", "block", "alias", "addrAlias", "estateType2", "lat2", "lng2", "streetCommunity"}; private static final Logger logger = Logger.getLogger(AddressParserServiceImpl.class); @@ -159,6 +162,15 @@ public class AddressParserServiceImpl implements AddressParserService { return building; } Building matchedBuilding; + //keywords使用aliyun接口返回的poi + AliyunBo aliyunBo = null; + if(params.isUseAliyunApi()){ + aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); + if(aliyunBo != null){ + String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); + addr.setKeywords(poi); + } + } if(params.isUseMap()){ matchedBuilding = findMatchedBuilding(addr, params.getBuildingType(), MetaDataType.MAP); }else{ @@ -168,9 +180,56 @@ public class AddressParserServiceImpl implements AddressParserService { matchedBuilding.setSearchAddress(addr); matchedBuilding.setSuggestName(getSuggestName(matchedBuilding)); matchedBuilding.setSuggestAddress(getSuggestAddress(matchedBuilding)); + if(params.isUseAliyunApi() && aliyunBo != null){ + completBuildingField(matchedBuilding, aliyunBo, params); + } return matchedBuilding; } + /** + * 信息不全时使用阿里接口补全数据 + * @param matchedBuilding + * @param aliyunBo + * @return + */ + void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){ + String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); + if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){ + if(!params.getAddress().contains(matchedBuilding.getSuggestName()) || poi.contains(matchedBuilding.getSuggestName())){ + matchedBuilding.setSuggestName(poi); + } + } + if(StringUtils.isBlank(matchedBuilding.getProvince())){ + matchedBuilding.setProvince(aliyunBo.getProv()); + } + if(StringUtils.isBlank(matchedBuilding.getCity())){ + matchedBuilding.setCity(aliyunBo.getCity()); + } + matchedBuilding.setStreet(aliyunBo.getRoad()); + matchedBuilding.setStreetno(aliyunBo.getRoadno()); + + Address addr = matchedBuilding.getSearchAddress(); + if(StringUtils.isBlank(addr.getDevelopmentZone())){ + addr.setDevelopmentZone(aliyunBo.getDevzone()); + } + if(StringUtils.isBlank(addr.getDistrict())){ + addr.setDistrict(aliyunBo.getDistrict()); + } + if(StringUtils.isBlank(addr.getTownship())){ + addr.setTownship(aliyunBo.getTown()); + } + if(StringUtils.isBlank(addr.getBuildingNumber())){ + addr.setBuildingNumber(aliyunBo.getHouseno()); + } + if(StringUtils.isBlank(addr.getUnitNumber())){ + addr.setUnitNumber(aliyunBo.getCellno()); + } + if(StringUtils.isBlank(addr.getRoomNumber())){ + addr.setRoomNumber(aliyunBo.getRoomno()); + } + matchedBuilding.setSearchAddress(addr); + } + Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){ AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); @@ -830,11 +889,7 @@ public class AddressParserServiceImpl implements AddressParserService { } } String cityDisplay = CityData.getCityDisplay(address.getCity()); - if(cityDisplay != null){ - formattedAddressBuilder.append(cityDisplay); - }else{ - formattedAddressBuilder.append(address.getCity() + "市"); - } + formattedAddressBuilder.append(cityDisplay != null ? cityDisplay : (StringUtils.isNotBlank(address.getCity())?(address.getCity()+ "市"):"")); if(StringUtils.isNotBlank(address.getDistrict())){ String orgDistrict = RegionData.getOrgName(address.getCity(), address.getDistrict()); if(StringUtils.isNotBlank(orgDistrict) && formattedAddressBuilder.indexOf(orgDistrict) == -1){ @@ -997,4 +1052,8 @@ public class AddressParserServiceImpl implements AddressParserService { public void setSeaweedDao(SeaweedDao seaweedDao) { this.seaweedDao = seaweedDao; } + + public void setAliyunService(AliyunService aliyunService) { + this.aliyunService = aliyunService; + } } 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 5968e0e5a..dff641cf0 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 @@ -1,6 +1,7 @@ package com.fangjia.service.address.mode; import com.fangjia.service.address.AddressParserUtil; +import com.fangjia.service.bo.AliyunBo; import com.fangjia.service.cnAnalyzer.Token; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; @@ -74,6 +75,15 @@ public class Address { /**调试时断点小区名*/ private String debugName; + private AliyunBo aliyunBo; + + public AliyunBo getAliyunBo() { + return aliyunBo; + } + + public void setAliyunBo(AliyunBo aliyunBo) { + this.aliyunBo = aliyunBo; + } /** diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Building.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Building.java index 1539f8e1c..a217fa8fd 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Building.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Building.java @@ -32,6 +32,25 @@ public class Building { private String suggestAddress; private String map; + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetno() { + return streetno; + } + + public void setStreetno(String streetno) { + this.streetno = streetno; + } + + private String street; + private String streetno; + public Building(District d){ this.city = d.getCity(); this.district = d.getRegion(); 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 3ce996636..22ff23d07 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 @@ -23,8 +23,14 @@ public class MatchParams { private PreciseLevel preciseLevel; /**是否使用地图库*/ private boolean useMap; + /**是否使用阿里云接口*/ + private boolean useAliyunApi; + /**是否输出经纬度*/ + private boolean exportLatAndLng; /**地址解析目的*/ private AddressParserGoal addressParserGoal; + + public String getProvince() { return province; } @@ -81,6 +87,22 @@ public class MatchParams { this.useMap = useMap; } + public boolean isUseAliyunApi() { + return useAliyunApi; + } + + public void setUseAliyunApi(boolean useAliyunApi) { + this.useAliyunApi = useAliyunApi; + } + + public boolean isExportLatAndLng() { + return exportLatAndLng; + } + + public void setExportLatAndLng(boolean exportLatAndLng) { + this.exportLatAndLng = exportLatAndLng; + } + public AddressParserGoal getAddressParserGoal() { return addressParserGoal; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 13980854f..21faa5322 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -163,7 +163,14 @@ public class CityProcessor extends AbstractAddressProcessor { }else{ allCity = RegionData.getAllCity(); } + String street = getStreet(address); for(String city : allCity){ + if(street != null){ + MatchResult matchResult = matchFirst(Pattern.compile(city + "[东南西北中一二三四五六七八九十百千\\d]?(路|街|大道|支路|村)"), street); + if(matchResult !=null){ + address = address.replace(matchResult.matchContent, ""); + } + } int index = 0; FragmentWeight weight = weightMap.get(city); if(weight == null){ @@ -221,7 +228,7 @@ public class CityProcessor extends AbstractAddressProcessor { } List weights = new ArrayList(weightMap.values()); if(weights.size() > 0){ - String street = getStreet(address); + /*String street = getStreet(address); if(street != null){ Iterator iterator = weights.iterator(); while(iterator.hasNext()){ @@ -230,7 +237,7 @@ public class CityProcessor extends AbstractAddressProcessor { iterator.remove(); } } - } + }*/ Collections.sort(weights); } if(weights.size() > 0){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunService.java new file mode 100644 index 000000000..91ab454a7 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunService.java @@ -0,0 +1,7 @@ +package com.fangjia.service.api; + +import com.fangjia.service.bo.AliyunBo; + +public interface AliyunService { + AliyunBo addressStand(String address, String city); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunServiceImpl.java new file mode 100644 index 000000000..b6b22f5a1 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AliyunServiceImpl.java @@ -0,0 +1,106 @@ +package com.fangjia.service.api; + +import com.aliyuncs.address_purification.model.v20191118.StructureAddressRequest; +import com.aliyuncs.address_purification.model.v20191118.StructureAddressResponse; +import com.fangjia.core.util.JsonUtils; +import com.fangjia.core.util.LoggerFactory; +import com.fangjia.service.bo.AliyunBo; +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.IAcsClient; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.profile.DefaultProfile; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; + +public class AliyunServiceImpl implements AliyunService { + + protected final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + public static String REGIONID = "cn-hangzhou"; + public static String ACCESSKEYID = "LTAIdaj4eSO79gzz"; + public static String SECRET = "xw6EsvqydZ9HC6zAvIB3ruQqVHynxf"; + public static String APPKEY = "68czunztrb1o"; + + @Override + public AliyunBo addressStand(String address, String city) { + DefaultProfile profile = DefaultProfile.getProfile( + REGIONID, + ACCESSKEYID, + SECRET); + IAcsClient client = new DefaultAcsClient(profile); + StructureAddressRequest request = new StructureAddressRequest(); + request.setServiceCode("addrp"); + request.setAppKey(APPKEY); + request.setText(address); + if(StringUtils.isNotBlank(city)){ + request.setDefaultCity(city); + } + try{ + StructureAddressResponse response = client.getAcsResponse(request); + JSONObject responseJson = JSONObject.fromObject(response.getData()); + String value = (String) responseJson.get("structure"); + AliyunBo aliyunBo = new AliyunBo(); + for (String key:value.split("\t")){ + String[] arry = key.split("="); + wrapField(arry[0],arry[1], aliyunBo); + } + return aliyunBo; + }catch(Exception e){ + LOGGER.error("", e); + return null; + } + } + + private void wrapField(String field,String value, AliyunBo aliyunBo){ + if("city".equals(field)){ + aliyunBo.setCity(value); + }else if("prov".equals(field)){ + aliyunBo.setProv(value); + }else if("district".equals(field)){ + aliyunBo.setDistrict(value); + }else if("poi".equals(field)){ + aliyunBo.setPoi(value); + }else if("subpoi".equals(field)){ + aliyunBo.setSubpoi(value); + }else if("houseno".equals(field)){ + aliyunBo.setHouseno(value); + }else if("cellno".equals(field)){ + aliyunBo.setCellno(value); + }else if("roomno".equals(field)){ + aliyunBo.setRoomno(value); + }else if("road".equals(field)){ + aliyunBo.setRoad(value); + }else if("roadno".equals(field)){ + aliyunBo.setRoadno(value); + }else if("floorno".equals(field)){ + aliyunBo.setFloorno(value); + }else if("town".equals(field)){ + aliyunBo.setTown(value); + }else if("devzone".equals(field)){ + aliyunBo.setDevzone(value); + } + } + public static void main(String[] args) throws ClientException { + DefaultProfile profile = DefaultProfile.getProfile( + REGIONID, + ACCESSKEYID, + SECRET); + IAcsClient client = new DefaultAcsClient(profile); + StructureAddressRequest request = new StructureAddressRequest(); + request.setServiceCode("addrp"); + request.setAppKey(APPKEY); + request.setText("杭州市文一西路969号"); + request.setDefaultProvince("浙江省"); + request.setDefaultCity("杭州市"); + request.setDefaultDistrict("余杭区"); + StructureAddressResponse response = client.getAcsResponse(request); + JSONObject responseJson = JSONObject.fromObject(response.getData()); + String value = (String) responseJson.get("structure"); + JSONObject json = new JSONObject(); + for (String key:value.split("\t")){ + String[] arry = key.split("="); + json.put(arry[0],arry[1]); + } + System.out.println(JsonUtils.convertJsonToJavaObj(json, AliyunBo.class)); + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/bo/AliyunBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/AliyunBo.java new file mode 100644 index 000000000..e061851d5 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/AliyunBo.java @@ -0,0 +1,148 @@ +package com.fangjia.service.bo; + +public class AliyunBo { + private String city; + private String prov; + private String district; + private String poi; + private String houseno; + private String cellno; + private String roomno; + private String status; + private String road; + private String roadno; + private String subroad; + private String floorno; + private String town; + private String subpoi; + private String community; + private String devzone; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getProv() { + return prov; + } + + public void setProv(String prov) { + this.prov = prov; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getPoi() { + return poi; + } + + public void setPoi(String poi) { + this.poi = poi; + } + + public String getHouseno() { + return houseno; + } + + public void setHouseno(String houseno) { + this.houseno = houseno; + } + + public String getCellno() { + return cellno; + } + + public void setCellno(String cellno) { + this.cellno = cellno; + } + + public String getRoomno() { + return roomno; + } + + public void setRoomno(String roomno) { + this.roomno = roomno; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + public String getRoadno() { + return roadno; + } + + public void setRoadno(String roadno) { + this.roadno = roadno; + } + + public String getSubroad() { + return subroad; + } + + public void setSubroad(String subroad) { + this.subroad = subroad; + } + + public String getFloorno() { + return floorno; + } + + public void setFloorno(String floorno) { + this.floorno = floorno; + } + + public String getTown() { + return town; + } + + public void setTown(String town) { + this.town = town; + } + + public String getSubpoi() { + return subpoi; + } + + public void setSubpoi(String subpoi) { + this.subpoi = subpoi; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getDevzone() { + return devzone; + } + + public void setDevzone(String devzone) { + this.devzone = devzone; + } +} \ No newline at end of file diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java index 0ee4abde1..a751826c7 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/addrepo/AddressRepoServiceImpl.java @@ -128,7 +128,7 @@ public class AddressRepoServiceImpl implements AddressRepoService { } matchMetaDatas.add(data); } - for(String keyword : keywords){ + /*for(String keyword : keywords){ HttpRequest request = new HttpRequest(); Map params = new HashMap(); params.put("query", keyword); @@ -221,7 +221,7 @@ public class AddressRepoServiceImpl implements AddressRepoService { } catch (HttpRequestException e) { e.printStackTrace(); } - } + }*/ Iterator it = matchMetaDatas.iterator(); while(it.hasNext()){ AddressMatchMetaData data = it.next(); From d4e02fdb373b3c3c3c5027a6e699a88d7e63eb7a Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 11:33:03 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=B8=9A?= =?UTF-8?q?=E5=9B=AD=E5=8C=BA=E4=B8=BA=E5=BC=80=E5=8F=91=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/service/address/processor/DistrictProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java index d55b7ae19..5cfba96b5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/DistrictProcessor.java @@ -25,7 +25,7 @@ public class DistrictProcessor extends AbstractAddressProcessor { static final String[] DISTRICT_NOISE = new String[]{"新城区","新区" , "城区", "市区" ,"辖区", "其他地区", "市辖区"}; static final String[] SPECIAL_CITY_DISTRICT_NOISE = new String[]{"城南", "城北", "城西", "城东", "新城区","新区" , "城区", "市区" ,"辖区", "其他地区", "市辖区"}; /**开发区列表*/ - static final String[] DEVELOPMENT_ZONE_LIST = new String[]{"高新技术开发区","经济开发区", "经济技术开发区", "经开区" , "高新区", "高新技术开发区", "开发区", "经济技术开发区"}; + static final String[] DEVELOPMENT_ZONE_LIST = new String[]{"高新技术开发区","经济开发区", "经济技术开发区", "经开区" , "高新区", "高新技术开发区", "开发区", "经济技术开发区", "工业园区"}; /*区域特征正则*/ static final String DISTRICT_SUFFIX_REGEX = "(县城|区|县|市|镇)"; From 5466ba78ef7cc83345fca3491e117e766d38068c Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 13:51:18 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E4=BC=A0=E5=8F=82=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 4 ++-- .../fangjia/open/model/AddesssMatchModel.java | 10 ++++++++++ .../com/fangjia/open/model/AddressModel.java | 8 ++++++++ .../service/address/mode/MatchParams.java | 19 ++++++++++--------- 4 files changed, 30 insertions(+), 11 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 483f228fc..1ee37e675 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 @@ -1743,7 +1743,7 @@ public class AddressController { // matchParams.setUseMap(true); matchParams.setUseAliyunApi(true); - matchParams.setExportLatAndLng(true); + matchParams.setContainsLocation(model.isContainsLocation()); Building building = addressParserService.standard(matchParams); Address address = building.getSearchAddress(); UniversalDto dto = UniversalDto.newDto(); @@ -1785,7 +1785,7 @@ public class AddressController { dto.append("unitNumber", address.getUnitNumber()); dto.append("roomNumber", address.getRoomNumber()); dto.append("formattedAddress", address.getFormattedAddress()); - if(matchParams.isExportLatAndLng()){ + if(matchParams.isContainsLocation()){ dto.append("lat", building.getLat()); dto.append("lng", building.getLng()); } 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 92345873e..3d362bbb9 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 @@ -19,6 +19,16 @@ public class AddesssMatchModel extends FangjiaApiModel { private String province; private String debugName; private boolean useMap; + + public boolean isContainsLocation() { + return containsLocation; + } + + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + + private boolean containsLocation; private boolean debug; public String getCity() { return city; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java index adf25301a..8c41c06ab 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java @@ -36,7 +36,15 @@ public class AddressModel extends FangjiaApiModel { private Integer pageNo; // 是否用于检查 private String dataLevel; + public boolean isContainsLocation() { + return containsLocation; + } + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + + private boolean containsLocation; public boolean isIncludeMaps() { return includeMaps; } 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 22ff23d07..498b12052 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 @@ -25,8 +25,17 @@ public class MatchParams { private boolean useMap; /**是否使用阿里云接口*/ private boolean useAliyunApi; + + public boolean isContainsLocation() { + return containsLocation; + } + + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + /**是否输出经纬度*/ - private boolean exportLatAndLng; + private boolean containsLocation; /**地址解析目的*/ private AddressParserGoal addressParserGoal; @@ -95,14 +104,6 @@ public class MatchParams { this.useAliyunApi = useAliyunApi; } - public boolean isExportLatAndLng() { - return exportLatAndLng; - } - - public void setExportLatAndLng(boolean exportLatAndLng) { - this.exportLatAndLng = exportLatAndLng; - } - public AddressParserGoal getAddressParserGoal() { return addressParserGoal; } From 378c5cf0818512610e06016d29ee466141651952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Tue, 30 Mar 2021 15:21:46 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 1ee37e675..acf9c9b6f 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 @@ -1691,7 +1691,14 @@ public class AddressController { } String result = addressMatchProxyService.standard(convertModelToMap(model)); if (result != null) { - mav.setModel(result); + JSONObject json = JSONObject.fromObject(result); + int code = json.getInt("code"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if(json.containsKey("result")){ + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } From 83359e83bf75406a35e3c71a50e6624c22e41923 Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 18:17:44 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E8=A1=A5=E5=85=85=E5=9F=8E=E5=B8=82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 4 ++-- .../service/address/AddressParserServiceImpl.java | 4 ++++ .../java/com/fangjia/service/address/mode/Address.java | 9 +++++++++ .../fangjia/service/address/processor/CityProcessor.java | 3 +++ 4 files changed, 18 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 1ee37e675..bd9daa20a 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 @@ -1722,10 +1722,10 @@ public class AddressController { public Object realStandardAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { + /*if (!OpenConfig.getConfig().addressMatchEnabled()) { mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); return mav; - } + }*/ if (StringUtils.isBlank(model.getAddress())) { mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); return mav; 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 5531c7669..aba3d131b 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 @@ -3,6 +3,7 @@ package com.fangjia.service.address; import com.fangjia.core.RegionData; import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.GeoUtils; +import com.fangjia.core.util.StringUtil; import com.fangjia.dal.QueryParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; @@ -169,6 +170,9 @@ public class AddressParserServiceImpl implements AddressParserService { if(aliyunBo != null){ String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); addr.setKeywords(poi); + if(StringUtils.isNotBlank(aliyunBo.getCity())){ + addr.setSuggestCity(aliyunBo.getCity()); + } } } if(params.isUseMap()){ 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 dff641cf0..21a79a722 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 @@ -57,6 +57,7 @@ public class Address { private String effectiveAddressPinYin; private String offset; private String miniAddress; + private String suggestCity; private String suggestDistrict; private String suggestName; private String suggestNamePinYin; @@ -302,6 +303,14 @@ public class Address { this.floor = floor; } + public String getSuggestCity() { + return suggestCity; + } + + public void setSuggestCity(String suggestCity) { + this.suggestCity = suggestCity; + } + public String getLoopLine() { return loopLine; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 21faa5322..f8ebb93bf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -121,6 +121,9 @@ public class CityProcessor extends AbstractAddressProcessor { } } } + if(StringUtils.isBlank(address.getCity())){ + address.setCity(address.getSuggestCity()); + } return RepeatStatus.NEXT; } From b32e8a77c31e2baabc686fc19db3a73625d38a85 Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 18:19:36 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8E=BB=E6=8E=89=E5=9F=8E=E5=B8=82=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 4 ++-- 1 file changed, 2 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 bd9daa20a..1ee37e675 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 @@ -1722,10 +1722,10 @@ public class AddressController { public Object realStandardAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - /*if (!OpenConfig.getConfig().addressMatchEnabled()) { + if (!OpenConfig.getConfig().addressMatchEnabled()) { mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); return mav; - }*/ + } if (StringUtils.isBlank(model.getAddress())) { mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); return mav; From 78e35cdef6a1ef0492616cd39145516b9100e511 Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 21:10:58 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/AddressParserServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 aba3d131b..d0a36dc4e 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 @@ -198,7 +198,9 @@ public class AddressParserServiceImpl implements AddressParserService { */ void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){ String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); - if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){ + if(StringUtils.isBlank(matchedBuilding.getSuggestName())){ + matchedBuilding.setSuggestName(poi); + }else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){ if(!params.getAddress().contains(matchedBuilding.getSuggestName()) || poi.contains(matchedBuilding.getSuggestName())){ matchedBuilding.setSuggestName(poi); } From 794b386807ff01582e10e681d7b036ebe27b8a75 Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 1 Apr 2021 09:21:38 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) 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 d0a36dc4e..9d82ac44a 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 @@ -206,10 +206,10 @@ public class AddressParserServiceImpl implements AddressParserService { } } if(StringUtils.isBlank(matchedBuilding.getProvince())){ - matchedBuilding.setProvince(aliyunBo.getProv()); + matchedBuilding.setProvince(formatProvince(aliyunBo.getProv())); } if(StringUtils.isBlank(matchedBuilding.getCity())){ - matchedBuilding.setCity(aliyunBo.getCity()); + matchedBuilding.setCity(RegionData.formatCity(aliyunBo.getCity())); } matchedBuilding.setStreet(aliyunBo.getRoad()); matchedBuilding.setStreetno(aliyunBo.getRoadno()); @@ -219,7 +219,7 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setDevelopmentZone(aliyunBo.getDevzone()); } if(StringUtils.isBlank(addr.getDistrict())){ - addr.setDistrict(aliyunBo.getDistrict()); + addr.setDistrict(RegionData.formatRegion(aliyunBo.getDistrict())); } if(StringUtils.isBlank(addr.getTownship())){ addr.setTownship(aliyunBo.getTown()); @@ -236,6 +236,16 @@ public class AddressParserServiceImpl implements AddressParserService { matchedBuilding.setSearchAddress(addr); } + String formatProvince(String province){ + Map> provinceData = ProvinceData.getAllProvince(); + for (String name : provinceData.keySet()) { + if(province.contains(name)){ + return name; + } + } + return null; + } + Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){ AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); @@ -916,15 +926,13 @@ public class AddressParserServiceImpl implements AddressParserService { if(StringUtils.isNotBlank(address.getStreet())){ formattedAddressBuilder.append(address.getStreet()); } - if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && !address.getStreet().endsWith("弄")){ - if(StringUtils.isNotBlank(address.getStreetNumber())){ - formattedAddressBuilder.append(address.getStreetNumber()); - } + if(StringUtils.isNotBlank(address.getStreet()) && StringUtils.isNotBlank(address.getStreetNumber())){ + formattedAddressBuilder.append(address.getStreetNumber()); } if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ formattedAddressBuilder.append(building.getAddress()); } - if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){ + if(StringUtils.isNotBlank(building.getSuggestName())){ formattedAddressBuilder.append(building.getSuggestName()); } if(StringUtils.isBlank(building.getSuggestName())){ @@ -934,11 +942,6 @@ public class AddressParserServiceImpl implements AddressParserService { formattedAddressBuilder.append(address.getOrgKeywords()); } } - if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")){ - if(StringUtils.isNotBlank(address.getStreetNumber())){ - formattedAddressBuilder.append(address.getStreetNumber()); - } - } if(StringUtils.isNotBlank(address.getOrgBuildingNumber())){ if(StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄") && StringUtils.isNotBlank(address.getStreetNumber()) From 65e68e0f2c499f524a5c6f955ccc60145ff0250a Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 1 Apr 2021 14:22:46 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8E=BBbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) 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 9d82ac44a..d323f797b 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 @@ -168,7 +168,7 @@ public class AddressParserServiceImpl implements AddressParserService { if(params.isUseAliyunApi()){ aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); if(aliyunBo != null){ - String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); + String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); addr.setKeywords(poi); if(StringUtils.isNotBlank(aliyunBo.getCity())){ addr.setSuggestCity(aliyunBo.getCity()); @@ -197,7 +197,7 @@ public class AddressParserServiceImpl implements AddressParserService { * @return */ void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){ - String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); + String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); if(StringUtils.isBlank(matchedBuilding.getSuggestName())){ matchedBuilding.setSuggestName(poi); }else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){ @@ -205,16 +205,14 @@ public class AddressParserServiceImpl implements AddressParserService { matchedBuilding.setSuggestName(poi); } } - if(StringUtils.isBlank(matchedBuilding.getProvince())){ - matchedBuilding.setProvince(formatProvince(aliyunBo.getProv())); - } - if(StringUtils.isBlank(matchedBuilding.getCity())){ - matchedBuilding.setCity(RegionData.formatCity(aliyunBo.getCity())); - } - matchedBuilding.setStreet(aliyunBo.getRoad()); - matchedBuilding.setStreetno(aliyunBo.getRoadno()); - Address addr = matchedBuilding.getSearchAddress(); + if(StringUtils.isBlank(addr.getProvince())){ + addr.setProvince(formatProvince(aliyunBo.getProv())); + } + if(StringUtils.isBlank(addr.getCity())){ + addr.setCity(RegionData.formatCity(aliyunBo.getCity())); + } + if(StringUtils.isBlank(addr.getDevelopmentZone())){ addr.setDevelopmentZone(aliyunBo.getDevzone()); } @@ -233,10 +231,19 @@ public class AddressParserServiceImpl implements AddressParserService { if(StringUtils.isBlank(addr.getRoomNumber())){ addr.setRoomNumber(aliyunBo.getRoomno()); } + if(StringUtils.isBlank(addr.getStreet())){ + addr.setStreet(aliyunBo.getRoad()); + } + if(StringUtils.isBlank(addr.getStreetNumber())){ + addr.setStreetNumber(aliyunBo.getRoadno()); + } matchedBuilding.setSearchAddress(addr); } String formatProvince(String province){ + if(StringUtils.isBlank(province)){ + return province; + } Map> provinceData = ProvinceData.getAllProvince(); for (String name : provinceData.keySet()) { if(province.contains(name)){ From a4f633c5096faa0b1e7ff1bffe82c02134b5cc37 Mon Sep 17 00:00:00 2001 From: wangxiu <762388265@qq.com> Date: Fri, 2 Apr 2021 02:25:53 +0800 Subject: [PATCH 15/16] map --- .../coresite/controllers/GuzhiController.java | 10 +++ .../src/main/webapp/guzhi/map.ftl | 72 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java create mode 100644 projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java new file mode 100644 index 000000000..c3d1c6116 --- /dev/null +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/GuzhiController.java @@ -0,0 +1,10 @@ +package com.fangjia.coresite.controllers; + +import com.fangjia.coresite.model.FangjiaModel; + +public class GuzhiController { + + public FangjiaModel mapAction(FangjiaModel model){ + return model; + } +} diff --git a/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl b/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl new file mode 100644 index 000000000..4b013115e --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/guzhi/map.ftl @@ -0,0 +1,72 @@ + + + + + + + 鍩烘湰鐑姏鍥� + + + +
+ + + + + + \ No newline at end of file From 1053fa0d540d36646d0215a1b1b0de3466a8dc2c Mon Sep 17 00:00:00 2001 From: wangxiu <762388265@qq.com> Date: Sat, 3 Apr 2021 08:08:41 +0800 Subject: [PATCH 16/16] map --- projects/fangjia-coresite/src/main/webapp/company/about.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index 0f386bf92..b1af2a8cc 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -124,7 +124,7 @@ - +<#-- -->