Merge remote-tracking branch 'origin/master'

This commit is contained in:
沈健
2021-04-12 17:30:25 +08:00
18 changed files with 207 additions and 58 deletions
+2 -2
View File
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.sothis</groupId>
<artifactId>sothis-core</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -154,7 +154,7 @@
<dependency>
<groupId>com.poseidon</groupId>
<artifactId>poseidon-message</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
+1 -1
View File
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.sothis</groupId>
<artifactId>sothis-web</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -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;
}
@@ -118,9 +118,13 @@
</td>
</tr>
</table>
<span style="font-size:12px;">查询到<b style="color:red;">${pager.totalRows!}</b>条记录</span>
<div>
<span style="font-size:12px;">查询到<b style="color:red;">${pager.totalRows!}</b>条记录</span>
<input class ="btn btn-primary" id="batchDelete" type="submit" value="批量删除" style="float: right" />
</div>
<table id="dataSheet" class="table table-hover table-condensed" name="reginTable">
<tr>
<th style="width:30px;"><input type="checkbox" id="checkAll"/>全选</th>
<th style="width:60px;">类型</th>
<th style="width:50px;">区域</th>
<th style="width:130px;">小区名</th>
@@ -142,6 +146,7 @@
<#if seawaterList??>
<#list seawaterList as it>
<tr>
<td><input type="checkbox" name="houseCheck" value="${it.id}"/></td>
<td>
<#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("操作失败");
}
});
}
});
</script>
</html>
</#compress>
@@ -205,7 +205,6 @@ public abstract class ElasticDaoImpl<E extends MongoEntity> extends AbstractJpaC
@Override
public void deleteByIds(List<String> idList) {
}
@Override
@@ -14,10 +14,8 @@ public interface SeawaterDao extends com.fangjia.dal.SeawaterDao<Seawater> {
Seawater findByIdFromEs(String id,String table);
List<Seawater> findSeawatersFromEs(String category, String city, String region, String name, List<String> alias, List<String> 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<Seawater> findHouses(String city, String region, List<String> alias, Integer minPrice, Integer maxPrice, Integer limit);
}
@@ -96,6 +96,44 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
return new ArrayList<Seawater>();
}
@Override
public void deleteById(String id) {
deleteByIds(Arrays.asList(id));
}
private Map<String, String> buildHeader() {
Base64 token = new Base64();
String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes());
Map<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/json");
headers.put("Authorization", "Basic " + authenticationEncoding + "");
return headers;
}
@Override
public void deleteByIds(List<String> 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<Seawater> 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);
@@ -1765,13 +1765,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();
@@ -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,}?(区|县)");
}
@@ -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<String> 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<String> 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<String> getSplitUnit(String[] split){
List<String> unitList = new ArrayList<String>();
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());
@@ -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+(室)*");
@@ -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<AddressFormatter> getFormatters(){
@@ -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() {
@@ -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("克孜勒苏柯尔克孜自治州", "克州"));
@@ -58,9 +58,6 @@ public class CityProcessor extends AbstractAddressProcessor {
List<String> possibleCities = speculateCityNameByRegion(address, city);
if(isUnique(possibleCities)){
formatCity = getFirst(possibleCities);
if(StringUtils.isBlank(address.getSuggestDistrict())){
address.setSuggestDistrict(city);
}
}
}
if(null != formatCity){
@@ -31,10 +31,15 @@ public interface SeawaterService {
void deleteById(String id);
/**
* 批量删除,英文逗号分割,如1,2,3
* @param ids
*/
void deleteByIds(String ids);
@Deprecated
List<Seawater> 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);
}
@@ -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;
}
+2 -2
View File
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.sothis</groupId>
<artifactId>sothis-core</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -154,7 +154,7 @@
<dependency>
<groupId>com.poseidon</groupId>
<artifactId>poseidon-message</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>