From 12448fed74e4a1825583077a83b8c9b2aafbfed9 Mon Sep 17 00:00:00 2001 From: xuhe Date: Mon, 12 Apr 2021 08:52:04 +0800 Subject: [PATCH 1/2] =?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 | 3 +- .../address/AddressParserPatterns.java | 12 +-- .../address/AddressParserServiceImpl.java | 81 +++++++++++++------ .../service/address/AddressParserUtil.java | 2 +- .../format/AddressFormatterFactory.java | 13 +++ .../fangjia/service/address/mode/Address.java | 8 +- .../service/address/mode/CityData.java | 4 +- .../address/processor/CityProcessor.java | 3 - 8 files changed, 85 insertions(+), 41 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..0d6d94e9f 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 @@ -1758,13 +1758,14 @@ public class AddressController { dto.append("township", address.getTownship()); 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()); } + }else{ + dto.append("name", building.getSuggestName()); } if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ String addr = building.getAddress(); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java index aec6c11b2..6015a13ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java @@ -7,14 +7,14 @@ import java.util.regex.Pattern; */ public interface AddressParserPatterns { - Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[一二三四五六七八九十百千\\d])+甲?(号)(?!楼))"); - Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); - Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼))"); - Pattern STAGE_PATTERN = Pattern.compile("(([一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([一二三四五六七八九十百千\\d]+)期"); - Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); + Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[零一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[零一二三四五六七八九十百千\\d])+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); + Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[零|一三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[零一二三四五六七八九十百千\\d]+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期"); + Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); Pattern TOWN = Pattern.compile("^.+?(乡|镇|街道)+"); Pattern NUMBER = Pattern.compile("\\d+"); - Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([一二三四五六七八九十百千\\d])+弄)|([甲乙]?([一二三四五六七八九十百千\\d]))+号(?!楼))"); + Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?([零一二三四五六七八九十百千\\d]))+号(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); Pattern DISTRICT = Pattern.compile("^.{2,}?(区|县)"); } 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 d323f797b..47d32dc97 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 @@ -169,7 +169,9 @@ public class AddressParserServiceImpl implements AddressParserService { aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); if(aliyunBo != null){ String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); - addr.setKeywords(poi); + if(StringUtils.isNotBlank(poi)){ + addr.setKeywords(poi); + } if(StringUtils.isNotBlank(aliyunBo.getCity())){ addr.setSuggestCity(aliyunBo.getCity()); } @@ -222,15 +224,13 @@ public class AddressParserServiceImpl implements AddressParserService { 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()); - } + addr.setOrgBuildingNumber(aliyunBo.getHouseno()); + addr.setBuildingNumber(aliyunBo.getHouseno()); + addr.setOrgUnitNumber(aliyunBo.getCellno()); + addr.setUnitNumber(aliyunBo.getCellno()); + addr.setOrgRoomNumber(aliyunBo.getRoomno()); + addr.setRoomNumber(aliyunBo.getRoomno()); + if(StringUtils.isBlank(addr.getStreet())){ addr.setStreet(aliyunBo.getRoad()); } @@ -440,17 +440,37 @@ public class AddressParserServiceImpl implements AddressParserService { if (connStreetNumber != null) { int index = address.indexOf(connStreetNumber); String remain = address.substring(0, index); - String unit = "号"; - String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); - if (split.length > 1 && remain.length() > 1) { - int start = Integer.parseInt(split[0]); - int end = Integer.parseInt(split[1]); - if(start < end){ - String addr; - for (int i = start; i <= end; i++) { - addr = remain + i + unit; - if (!addrAlias.contains(addr)) { - addrAlias.add(addr); + String[] split = connStreetNumber.split("(~|-|~)"); + String[] splitComma = connStreetNumber.split("(,|,|、)"); +// String unit = "号"; +// String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); + if(remain.length() > 1){ + if (split.length > 1) { + List unitList = getSplitUnit(split); + String regularStr = "(" + StringUtils.join(unitList, "|") + ")"; + int start = Integer.parseInt(split[0].replaceAll(regularStr, "")); + int end = Integer.parseInt(split[1].replaceAll(regularStr, "")); + for(String unit:unitList){ + if(start < end){ + String addr; + for (int i = start; i <= end; i++) { + addr = remain + i + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } + } + } + } + } + if(splitComma.length > 1){ + List unitList = getSplitUnit(splitComma); + for(String unit:unitList){ + for(String value:splitComma){ + int num = Integer.parseInt(value.replaceAll(StringUtils.join(Collections.singleton("(" + StringUtils.join(unitList, "|") + ")"), "|"), "")); + String addr = remain + num + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } } } } @@ -473,6 +493,16 @@ public class AddressParserServiceImpl implements AddressParserService { } } + private List getSplitUnit(String[] split){ + List unitList = new ArrayList(); + for(String value:split){ + String unit = StringUtils.join(DataUtil.getHanzi(value), ""); + if(StringUtils.isNotBlank(unit)){ + unitList.add(unit); + } + } + return unitList; + } /** * 在CPDB库中查询匹配到的数据 * @@ -955,15 +985,18 @@ public class AddressParserServiceImpl implements AddressParserService { && address.getStreetNumber().endsWith(address.getOrgBuildingNumber())){ }else{ - formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); + formattedAddressBuilder.append(address.getBuildingNumber()); +// formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); } } if(StringUtils.isNotBlank(address.getOrgUnitNumber())){ - formattedAddressBuilder.append(address.getUnitNumber() + "单元"); + formattedAddressBuilder.append(address.getUnitNumber()); +// formattedAddressBuilder.append(address.getUnitNumber() + "单元"); } if(StringUtils.isNotBlank(address.getOrgRoomNumber())){ - formattedAddressBuilder.append(address.getRoomNumber() + "室"); + formattedAddressBuilder.append(address.getRoomNumber()); +// formattedAddressBuilder.append(address.getRoomNumber() + "室"); } address.setFormattedAddress(formattedAddressBuilder.toString()); 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 e1f4b1338..490c3dbb4 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 @@ -23,7 +23,7 @@ public class AddressParserUtil { 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+号"); + public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("(\\d+)(支弄|号|弄)?(~|-|~|,|,|、)\\d+(支弄|号|弄)"); static final Pattern SEPARATOR_PATTERN = Pattern.compile("、|,"); static final Pattern STREET_NUMBER_PATTERN = Pattern.compile("(\\d+(~|-|~|、|,))*\\d+(号|栋|幢)"); static final Pattern UNIT_NUMBER_PATTERN = Pattern.compile("(\\w+室)|(\\w+(号|栋|幢|单元))\\w+(室)*"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java index 4cfc89037..cc1334533 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java @@ -250,6 +250,19 @@ public class AddressFormatterFactory { } }); + /** + * 一环路东二段162 + */ + formatters.add(new AbstractAddressFormatter(Pattern.compile(".*(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))")) { + final Pattern TARGET = Pattern.compile("(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))"); + + @Override + protected String doFormat(String address) { + String matchStr = DataUtil.match(address, TARGET); + String formatStr = matchStr + "号"; + return address.replace(matchStr,formatStr); + } + }); } public List getFormatters(){ 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 21a79a722..2e286a5ed 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 @@ -427,12 +427,12 @@ public class Address { } public void setOrgRoomNumber(String orgRoomNumber) { - if(orgRoomNumber.length() > 2){ - orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); - } if(StringUtils.isNotBlank(orgRoomNumber)){ - this.orgRoomNumber = orgRoomNumber; + if(orgRoomNumber.length() > 2){ + orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); + } } + this.orgRoomNumber = orgRoomNumber; } public String getKeywords() { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java index ab21931c7..8225e00c0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java @@ -14,8 +14,8 @@ public class CityData { put("文山州", Arrays.asList("文山壮族苗族自治州")); put("凉山州", Arrays.asList("凉山彝族自治州")); - put("呼和浩特", Arrays.asList("呼市")); - put("乌鲁木齐", Arrays.asList("乌市")); +// put("呼和浩特", Arrays.asList("呼市")); +// put("乌鲁木齐", Arrays.asList("乌市")); put("阿里", Arrays.asList("阿里地区")); put("红河", Arrays.asList("红河哈尼族彝族自治州")); put("克孜勒苏", Arrays.asList("克孜勒苏柯尔克孜自治州", "克州")); 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 f8ebb93bf..2dd886f8b 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 @@ -58,9 +58,6 @@ public class CityProcessor extends AbstractAddressProcessor { List possibleCities = speculateCityNameByRegion(address, city); if(isUnique(possibleCities)){ formatCity = getFirst(possibleCities); - if(StringUtils.isBlank(address.getSuggestDistrict())){ - address.setSuggestDistrict(city); - } } } if(null != formatCity){ From 560bde3f7857401ec373255957b5145551c6cde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Mon, 12 Apr 2021 14:21:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/chafangtong-service/pom.xml | 4 +- projects/fangjia-bkoff/pom.xml | 2 +- .../bkoff/controllers/SeawaterController.java | 9 ++++ .../src/main/webapp/seawater/houseList.ftl | 53 +++++++++++++++++-- .../java/com/fangjia/dal/ElasticDaoImpl.java | 1 - .../fangjia/dal/seawater/dao/SeawaterDao.java | 2 - .../dal/seawater/dao/SeawaterDaoImpl.java | 46 ++++++++++++++++ .../mongo/fangjia/SeawaterService.java | 7 ++- .../mongo/fangjia/SeawaterServiceImpl.java | 11 ++-- projects/geluke-service/pom.xml | 4 +- 10 files changed, 122 insertions(+), 17 deletions(-) diff --git a/projects/chafangtong-service/pom.xml b/projects/chafangtong-service/pom.xml index c38bee1c1..d2c64b841 100644 --- a/projects/chafangtong-service/pom.xml +++ b/projects/chafangtong-service/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided @@ -154,7 +154,7 @@ com.poseidon poseidon-message - 0.0.1-SNAPSHOT + 0.0.1 org.mongodb diff --git a/projects/fangjia-bkoff/pom.xml b/projects/fangjia-bkoff/pom.xml index 28b93ccc1..41b8a352d 100644 --- a/projects/fangjia-bkoff/pom.xml +++ b/projects/fangjia-bkoff/pom.xml @@ -99,7 +99,7 @@ org.sothis sothis-web - 0.2.0-SNAPSHOT + 0.2.0 org.springframework diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java index 1ea3ac457..a223c1674 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java @@ -12,6 +12,7 @@ import com.fangjia.service.mongo.fangjia.SeawaterService; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Pager; +import org.sothis.web.mvc.annotation.Param; import java.io.UnsupportedEncodingException; import java.util.Arrays; @@ -116,6 +117,14 @@ public class SeawaterController { return ret; } + public Object batchDeleteAction(@Param(name="ids") String ids) throws UnsupportedEncodingException { + JsonModel ret = new JsonModel(); + if (StringUtils.isNotBlank(ids)){ + seawaterService.deleteByIds(ids); + } + return ret; + } + public void setSeawaterService(SeawaterService seawaterService) { this.seawaterService = seawaterService; } diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl index 97bc38d1f..69d4cd0f7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl @@ -118,9 +118,13 @@ - 鏌ヨ鍒�${pager.totalRows!}鏉¤褰� +
+ 鏌ヨ鍒�${pager.totalRows!}鏉¤褰� + +
+ @@ -142,6 +146,7 @@ <#if seawaterList??> <#list seawaterList as it> +
鍏ㄩ�� 绫诲瀷 鍖哄煙 灏忓尯鍚�
<#if it.category! == 'sell'> 浜屾墜鎴� @@ -249,7 +254,7 @@ } }); } - + changeCity('${cityDisplay!}'); $(".hrefClick").click(function(){ @@ -336,8 +341,48 @@ $("#roomSpan").hide(); } } - - + + // 鍏ㄩ�� + $("#checkAll").click(function(){ + $('input[name="houseCheck"]').each(function() { + var _this = this + if (_this.checked == true) { + _this.checked = false + } else { + _this.checked = true + } + + }) + }) + + $("#batchDelete").click(function(){ + if(confirm('纭瑕佸垹闄ゆ墍閫夌殑鏁版嵁鍚楋紵')) { + var ids = ""; + $('input:checkbox[name=houseCheck]:checked').each(function() { + var _this = $(this); + ids += _this.val() + "," + }); + if (ids == "") { + alert("璇烽�夋嫨鏁版嵁") + return false; + } + jQuery.ajax({ + type: 'POST', + url: '../seawater/batchDelete', + data:{ids:ids}, + dataType: 'json', + timeout: 100000, + success: function(model) { + alert("鎵归噺鍒犻櫎鎿嶄綔鎴愬姛"); + location.reload(); + }, + error : function() { + //alert("鎿嶄綔澶辫触"); + } + }); + } + }); + \ No newline at end of file diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java index 0e45edde5..ea6749194 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java @@ -205,7 +205,6 @@ public abstract class ElasticDaoImpl extends AbstractJpaC @Override public void deleteByIds(List idList) { - } @Override diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java index dd28f68b7..edbd0546e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java @@ -14,10 +14,8 @@ public interface SeawaterDao extends com.fangjia.dal.SeawaterDao { Seawater findByIdFromEs(String id,String table); - List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit , String table); List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit); - } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 9ff57486c..a565fa061 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -96,6 +96,44 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i return new ArrayList(); } + @Override + public void deleteById(String id) { + deleteByIds(Arrays.asList(id)); + } + + private Map buildHeader() { + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + return headers; + } + + @Override + public void deleteByIds(List idList) { + HttpRequest request = new HttpRequest(); + + JSONObject reqBody = new JSONObject(); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerms("_id", idList)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + + JSONObject script = new JSONObject(); + script.put("source", "ctx._source.status=1"); + reqBody.put("script", script); + + try { + request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query", reqBody, this.buildHeader(), "UTF-8"); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + } + private JSONObject addMatch(String name, String value){ JSONObject term = new JSONObject(); JSONObject match = new JSONObject(); @@ -338,6 +376,14 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i if(limit >= 0){ reqBody.put("size", limit); } + + // 不展示删除 + JSONObject param = new JSONObject(); + param.put("status", 0); + JSONObject temp = new JSONObject(); + temp.put("term", param); + jsonList.add(temp); + query.put("must", jsonList); q.put("bool", query); reqBody.put("query", q); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java index edc15e855..4fafa6663 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java @@ -31,10 +31,15 @@ public interface SeawaterService { void deleteById(String id); + /** + * 批量删除,英文逗号分割,如1,2,3 + * @param ids + */ + void deleteByIds(String ids); + @Deprecated List findAllSeawater(String category, String city, String name, String region, Integer room, String root, String sort, Integer startDate, Integer endDate, int start, int limit, boolean order, String[] fields); @Deprecated int findAllSeawaterCount(String category, String city, String name, String region, Integer room, String root, Integer startDate, Integer endDate); - } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java index d7e31ca58..2dc484035 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java @@ -12,10 +12,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.TermQuery; import org.apache.solr.client.solrj.util.ClientUtils; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public class SeawaterServiceImpl implements SeawaterService { private SeawaterDao seawaterDao; @@ -188,6 +185,12 @@ public class SeawaterServiceImpl implements SeawaterService { seawaterDao.deleteById(id); } + @Override + public void deleteByIds(String ids) { + String[] idArr = ids.split(","); + seawaterDao.deleteByIds(Arrays.asList(idArr)); + } + public void setSeawaterDao(SeawaterDao seawaterDao) { this.seawaterDao = seawaterDao; } diff --git a/projects/geluke-service/pom.xml b/projects/geluke-service/pom.xml index 5dc163edc..08acecd69 100644 --- a/projects/geluke-service/pom.xml +++ b/projects/geluke-service/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided @@ -154,7 +154,7 @@ com.poseidon poseidon-message - 0.0.1-SNAPSHOT + 0.0.1 org.mongodb