/district/suggest 添加别名
This commit is contained in:
+29
-28
@@ -46,7 +46,7 @@ public class DistrictController {
|
||||
private DistrictStatRentService districtStatRentService;
|
||||
private DistrictStatService districtStatService;
|
||||
private UserCityService userCityService;
|
||||
private FjtUsersService fjtUsersService;
|
||||
private FjtUsersService fjtUsersService;
|
||||
|
||||
private SeaweedImagesService seaweedImagesService;
|
||||
|
||||
@@ -59,14 +59,14 @@ public class DistrictController {
|
||||
* @param keyword
|
||||
* @return
|
||||
*/
|
||||
public Object suggestAction( @Param(name = "city") String city, @Param(name = "cat") String cat, @Param(name = "keyword") String keyword,
|
||||
@Param(name = "limit") Integer limit,@Param(name="lat")Double lat, @Param(name="lng")Double lng) {
|
||||
public Object suggestAction(@Param(name = "city") String city, @Param(name = "cat") String cat, @Param(name = "keyword") String keyword,
|
||||
@Param(name = "limit") Integer limit, @Param(name = "lat") Double lat, @Param(name = "lng") Double lng) {
|
||||
JsonModel model = new JsonModel();
|
||||
if (limit == null || limit > 100 || limit <= 0) {
|
||||
limit = 10;
|
||||
}
|
||||
System.out.println(cat + "#" + city + "#" + keyword + "#" + limit + "#" + lng + "#" + lat);
|
||||
List<AutoCompleteBo> suggestList = getDistrictByKeyword(cat, city, keyword, limit, lng, lat);
|
||||
List<AutoCompleteBo> suggestList = getDistrictByKeyword(cat, city, keyword, limit, lng, lat);
|
||||
model.setJsonModel(suggestList);
|
||||
return model;
|
||||
}
|
||||
@@ -79,14 +79,14 @@ public class DistrictController {
|
||||
|
||||
String login_user_type = CookieUtils.getCookieValue(request, "login_user_type");
|
||||
//保存企业用户选择的城市,企业用户7天
|
||||
String weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id");
|
||||
String weiXinId = CookieUtils.getCookieValue(request, "we_chat_open_id");
|
||||
// if(StringUtils.isBlank(login_user_type) || StringUtils.isBlank(weiXinId)){
|
||||
// response.sendRedirect("/coming");
|
||||
// return null;
|
||||
// }
|
||||
if("b".equals(login_user_type) || "gb".equals(login_user_type)){
|
||||
CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_city_"+ login_user_type , model.getCityName());
|
||||
}
|
||||
if ("b".equals(login_user_type) || "gb".equals(login_user_type)) {
|
||||
CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_city_" + login_user_type, model.getCityName());
|
||||
}
|
||||
try {
|
||||
Long userId = Long.parseLong(CookieUtils.getCookieValue(request, "login_user_id"));
|
||||
if (userId != null) {
|
||||
@@ -118,14 +118,14 @@ public class DistrictController {
|
||||
|
||||
BooleanQuery srQuery1 = new BooleanQuery();
|
||||
BooleanQuery nameQuery = new BooleanQuery();
|
||||
// nameQuery.add(new TermQuery(new Term("district_name", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("alias_std", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("address", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("district_name", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("alias_std", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("address", keyword)), BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), BooleanClause.Occur.SHOULD);
|
||||
nameQuery.add(new TermQuery(new Term("keyword", keyword)), BooleanClause.Occur.SHOULD);
|
||||
//nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), BooleanClause.Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索
|
||||
srQuery1.add(nameQuery, BooleanClause.Occur.SHOULD);
|
||||
if(lat != null && lng != null && lat != 0 && lng != 0){
|
||||
if (lat != null && lng != null && lat != 0 && lng != 0) {
|
||||
Map<String, Double> geo = GeocodeUtils.geoconvBaiduToGoogle(lng, lat);
|
||||
SdQuery sdQuery = new SdQuery();
|
||||
sdQuery.setPoint(geo.get("lat") + "," + geo.get("lng"));
|
||||
@@ -134,7 +134,7 @@ public class DistrictController {
|
||||
params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery));
|
||||
}
|
||||
params.add(new QueryParam("$sr", new SrQuery(srQuery1)));
|
||||
List<District> districts = districtService.findAllByParams(params, 0, limit, new String[]{"region", "name", "address", "addrAlias","id"});
|
||||
List<District> districts = districtService.findAllByParams(params, 0, limit, new String[]{"region", "name", "address", "addrAlias", "id", "alias"});
|
||||
List<AutoCompleteBo> ret = new ArrayList<AutoCompleteBo>(districts.size());
|
||||
for (District district : districts) {
|
||||
AutoCompleteBo bo = new AutoCompleteBo();
|
||||
@@ -143,24 +143,27 @@ public class DistrictController {
|
||||
bo.setDesc(district.getAddress());
|
||||
bo.setRegion(district.getRegion());
|
||||
bo.setId(district.getId());
|
||||
if (!district.getAlias().isEmpty()) {
|
||||
bo.setAlias(district.getAlias());
|
||||
}
|
||||
ret.add(bo);
|
||||
}
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
public Object districtDetailAction(DistrictModel districtModel,HttpServletRequest request,HttpServletResponse response) {
|
||||
public Object districtDetailAction(DistrictModel districtModel, HttpServletRequest request, HttpServletResponse response) {
|
||||
//id和name不能同时为空
|
||||
if(StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) {
|
||||
if (StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) {
|
||||
districtModel.setMsg("参数错误");
|
||||
return districtModel;
|
||||
}
|
||||
|
||||
District district = null;
|
||||
if(StringUtils.isNotBlank(districtModel.getId())) {
|
||||
if (StringUtils.isNotBlank(districtModel.getId())) {
|
||||
district = districtService.findById(districtModel.getId());
|
||||
|
||||
if(district != null) {
|
||||
if (district != null) {
|
||||
districtModel.setCityName(district.getCity());
|
||||
districtModel.setRegion(district.getRegion());
|
||||
districtModel.setName(district.getName());
|
||||
@@ -176,7 +179,6 @@ public class DistrictController {
|
||||
String userId = CookieUtils.getCookieValue(request, "login_user_id");
|
||||
|
||||
|
||||
|
||||
//小区租金
|
||||
List<DistrictStatRentBo> districtStatRentBos = districtStatRentService.findAllHouseTypeByDistrictStatRent(new DistrictKey(district));
|
||||
//处理图片链接
|
||||
@@ -195,8 +197,8 @@ public class DistrictController {
|
||||
districtModel.setDistrictStatBo(districtStatBo);
|
||||
districtModel.setDistrictStatRentBos(districtStatRentBos);
|
||||
|
||||
String city=request.getParameter("city");
|
||||
boolean is=true;
|
||||
String city = request.getParameter("city");
|
||||
boolean is = true;
|
||||
if (null != districtStatBo && null != districtStatBo.getDefaultDistrictStat()) {
|
||||
double credit = districtStatBo.getDefaultDistrictStat().getCredit();
|
||||
|
||||
@@ -215,7 +217,7 @@ public class DistrictController {
|
||||
} else {
|
||||
is = true;
|
||||
}
|
||||
if(!is){
|
||||
if (!is) {
|
||||
try {
|
||||
response.sendRedirect("wrongPrice");
|
||||
} catch (Exception e) {
|
||||
@@ -225,7 +227,6 @@ public class DistrictController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
private DistrictStatBo getDistrictStat(DistrictKey districtKey) {
|
||||
District district = districtService.findDistrict(districtKey, true);
|
||||
DistrictStatBo statBo = null;
|
||||
@@ -239,8 +240,8 @@ public class DistrictController {
|
||||
// 同比数据
|
||||
if (statBo != null) {
|
||||
Date date = DateUtil.getThisWeekInLastYear();
|
||||
Date[] dateList = { DateUtil.getBeforeDay(date, 14), DateUtil.getBeforeDay(date, 7), DateUtil.getAfterDay(date, 7),
|
||||
DateUtil.getAfterDay(date, 14), date };
|
||||
Date[] dateList = {DateUtil.getBeforeDay(date, 14), DateUtil.getBeforeDay(date, 7), DateUtil.getAfterDay(date, 7),
|
||||
DateUtil.getAfterDay(date, 14), date};
|
||||
|
||||
DistrictStatBo yearPeriodStatBo = null;
|
||||
Integer markup = Integer.MAX_VALUE;
|
||||
@@ -330,9 +331,9 @@ public class DistrictController {
|
||||
this.userCityService = userCityService;
|
||||
}
|
||||
|
||||
public void setFjtUsersService(FjtUsersService fjtUsersService) {
|
||||
this.fjtUsersService = fjtUsersService;
|
||||
}
|
||||
public void setFjtUsersService(FjtUsersService fjtUsersService) {
|
||||
this.fjtUsersService = fjtUsersService;
|
||||
}
|
||||
|
||||
public void setSeaweedImagesService(SeaweedImagesService seaweedImagesService) {
|
||||
this.seaweedImagesService = seaweedImagesService;
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.fangjia.service.api;
|
||||
|
||||
import com.fangjia.dal.mongo.model.PriceJiucuo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AutoCompleteBo {
|
||||
private String val;
|
||||
private String desc;
|
||||
@@ -20,6 +22,8 @@ public class AutoCompleteBo {
|
||||
private Double lat;
|
||||
private Double lng;
|
||||
|
||||
private List<String> alias;
|
||||
|
||||
/*** @Deprecated end ****/
|
||||
|
||||
public String getName() {
|
||||
@@ -133,4 +137,11 @@ public class AutoCompleteBo {
|
||||
public void setLng(Double lng) {
|
||||
this.lng = lng;
|
||||
}
|
||||
public List<String> getAlias() {
|
||||
return alias;
|
||||
}
|
||||
|
||||
public void setAlias(List<String> alias) {
|
||||
this.alias = alias;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user