+37
-1
@@ -7,9 +7,12 @@ import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.fangjia.core.RegionData;
|
||||
import com.fangjia.core.util.DateUtil;
|
||||
import com.fangjia.core.util.HttpRequest;
|
||||
import com.fangjia.dal.mongo.model.*;
|
||||
import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto;
|
||||
import com.fangjia.open.model.AvgPriceQueryModel;
|
||||
import com.fangjia.open.model.BasicModel;
|
||||
import com.fangjia.open.util.CommonDtoUtils;
|
||||
import com.fangjia.service.datastore.RegionStatService;
|
||||
import com.fangjia.service.district.DistrictFacilitysService;
|
||||
import com.fangjia.service.district.DistrictStatRentService;
|
||||
@@ -1164,7 +1167,40 @@ public class DistrictController {
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Object addrFacilitysAction(DistrictSearchModel model, @Param(name = "address") String address) throws Exception{
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
mav.setViewType("rest");
|
||||
if (StringUtils.isBlank(address)) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "地址必须输入"));
|
||||
return mav;
|
||||
} else {
|
||||
String cat = "district";
|
||||
|
||||
HttpRequest request = new HttpRequest();
|
||||
JSONObject json = null;
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("address", address);
|
||||
params.put("category", "property");
|
||||
//新匹配接口
|
||||
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
|
||||
District property = null;
|
||||
if (json != null && json.size() > 0) {
|
||||
MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json);
|
||||
property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat);
|
||||
if (null == property) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在"));
|
||||
return mav;
|
||||
}
|
||||
DistrictFacilitys facilitys = districtFacilitysService.findByDistrict(property);
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(facilitys));
|
||||
}else{
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "小区数据不存在"));
|
||||
}
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
||||
+84
-10
@@ -21,12 +21,14 @@ import com.fangjia.open.HttpCode;
|
||||
import com.fangjia.open.OpenHttpCodeEnum;
|
||||
import com.fangjia.open.dto.HouseDto;
|
||||
import com.fangjia.open.dto.UniversalDto;
|
||||
import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto;
|
||||
import com.fangjia.open.interceptors.Authority;
|
||||
import com.fangjia.open.interceptors.Role;
|
||||
import com.fangjia.open.model.BasicModel;
|
||||
import com.fangjia.open.model.HousePublishModel;
|
||||
import com.fangjia.open.model.HouseSearchModel;
|
||||
import com.fangjia.open.model.RestfulModelAndView;
|
||||
import com.fangjia.open.util.CommonDtoUtils;
|
||||
import com.fangjia.open.util.FileDao;
|
||||
import com.fangjia.open.ws.query.CollateralSampleQuery;
|
||||
import com.fangjia.open.ws.query.SampleQuery;
|
||||
@@ -57,6 +59,7 @@ import com.fangjia.service.open.HousePojo;
|
||||
import com.fangjia.service.sql.ApiUserService;
|
||||
import com.fangjia.service.sql.UserService;
|
||||
import com.fangjia.service.web.MenuService;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.sothis.core.util.Closure;
|
||||
@@ -331,18 +334,50 @@ public class HouseController {
|
||||
|
||||
CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean();
|
||||
BeanUtils.copyProperties(q, queryBean);
|
||||
|
||||
|
||||
String propertyTypeCode = queryBean.getPropertyTypeCode();
|
||||
if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){
|
||||
throw new Exception("propertyTypeCode取值非法");
|
||||
}
|
||||
// String propertyTypeCode = queryBean.getPropertyTypeCode();
|
||||
// if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){
|
||||
// throw new Exception("propertyTypeCode取值非法");
|
||||
// }
|
||||
String cat = "district";
|
||||
District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat);
|
||||
if(property == null){
|
||||
throw new Exception("未找到该小区");
|
||||
|
||||
if(StringUtils.isNotBlank(queryBean.getCity()) && StringUtils.isNotBlank(queryBean.getDistrict()) && StringUtils.isNotBlank(queryBean.getBuildingName())){
|
||||
District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat);
|
||||
if(property == null){
|
||||
throw new Exception("未找到该小区");
|
||||
}
|
||||
queryBean.setProperty(property);
|
||||
}else if(StringUtils.isNotBlank(queryBean.getAddress())){
|
||||
HttpRequest request = new HttpRequest();
|
||||
JSONObject json = null;
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("city", queryBean.getCity());
|
||||
params.put("address", queryBean.getAddress());
|
||||
params.put("category", "property");
|
||||
//新匹配接口
|
||||
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
|
||||
if (json != null && json.size()>0) {
|
||||
MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json);
|
||||
District property = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), cat);
|
||||
if(property == null){
|
||||
throw new Exception("未找到该小区");
|
||||
}
|
||||
queryBean.setProperty(property);
|
||||
}else{
|
||||
throw new Exception("未找到该小区");
|
||||
}
|
||||
}
|
||||
queryBean.setProperty(property);
|
||||
String estateType = queryBean.getProperty().getEstateType2();
|
||||
queryBean.setPropertyTypeCode("01");
|
||||
if(StringUtils.isNotBlank(estateType)){
|
||||
if(estateType.equals("普通住宅")){
|
||||
queryBean.setPropertyTypeCode("01");
|
||||
}else if(estateType.equals("别墅")){
|
||||
queryBean.setPropertyTypeCode("02");
|
||||
}else if(estateType.equals("商住")){
|
||||
queryBean.setPropertyTypeCode("03");
|
||||
}
|
||||
}
|
||||
|
||||
Integer decrCondCode = queryBean.getDecrCondCode();
|
||||
if(decrCondCode == null){
|
||||
decrCondCode = 2;
|
||||
@@ -362,6 +397,45 @@ public class HouseController {
|
||||
return queryBeans;
|
||||
}
|
||||
|
||||
|
||||
// private List<CollateralSampleQueryBean> convertSampileQueryToBean(SampleQuery... queries) throws Exception{
|
||||
//
|
||||
// List<CollateralSampleQueryBean> queryBeans = new ArrayList<CollateralSampleQueryBean>(queries.length);
|
||||
// for(SampleQuery q : queries){
|
||||
//
|
||||
// CollateralSampleQueryBean queryBean = new CollateralSampleQueryBean();
|
||||
// BeanUtils.copyProperties(q, queryBean);
|
||||
//
|
||||
//
|
||||
// String propertyTypeCode = queryBean.getPropertyTypeCode();
|
||||
// if(!Arrays.asList("01", "02", "03").contains(propertyTypeCode)){
|
||||
// throw new Exception("propertyTypeCode取值非法");
|
||||
// }
|
||||
// String cat = "district";
|
||||
// District property = districtService.findByNameAndAlias(queryBean.getCity(), queryBean.getDistrict(), queryBean.getBuildingName(), cat);
|
||||
// if(property == null){
|
||||
// throw new Exception("未找到该小区");
|
||||
// }
|
||||
// queryBean.setProperty(property);
|
||||
// Integer decrCondCode = queryBean.getDecrCondCode();
|
||||
// if(decrCondCode == null){
|
||||
// decrCondCode = 2;
|
||||
// }
|
||||
// if(decrCondCode > 5 || decrCondCode < 1){
|
||||
// throw new Exception("decrCondCode取值非法");
|
||||
// }
|
||||
// Integer towardDirectCode = queryBean.getTowardDirectCode();
|
||||
// if(towardDirectCode == null){
|
||||
// towardDirectCode = 3;
|
||||
// }
|
||||
// if(towardDirectCode > 10 || towardDirectCode < 1){
|
||||
// throw new Exception("towardDirectCode取值非法");
|
||||
// }
|
||||
// queryBeans.add(queryBean);
|
||||
// }
|
||||
// return queryBeans;
|
||||
// }
|
||||
|
||||
public Object detailAction(HousePublishModel model){
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
mav.setViewType("rest");
|
||||
|
||||
@@ -11,14 +11,14 @@ public class SampleQuery {
|
||||
|
||||
|
||||
/**城市*/
|
||||
@NotBlank
|
||||
// @NotBlank
|
||||
private String city;
|
||||
|
||||
/**区域*/
|
||||
@NotBlank
|
||||
// @NotBlank
|
||||
private String district;
|
||||
|
||||
@NotBlank
|
||||
// @NotBlank
|
||||
/**小区名*/
|
||||
private String buildingName;
|
||||
/**楼栋名称*/
|
||||
@@ -58,6 +58,7 @@ public class SampleQuery {
|
||||
|
||||
private Date updateDate;
|
||||
|
||||
@NotBlank
|
||||
private String address;
|
||||
|
||||
@Min(1)
|
||||
|
||||
Reference in New Issue
Block a user