北交所接口合并

This commit is contained in:
mjt
2023-12-19 10:51:18 +08:00
parent 316297aeb6
commit c4eebbfe36
24 changed files with 4581 additions and 458 deletions
@@ -522,6 +522,7 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
public District findOneByKey(DistrictKey districtKey, String cat);
List<District> findNearestDistrict(District district, int radiusMeters, int limit);
List<District> doFindNearestHasHouseDistrict(District district, int radiusMeters, int limit) ;
List<District> findNearestDistrict(District district, int radiusMeters, String[] fields, int limit);
@@ -2297,6 +2297,22 @@ public class DistrictServiceImpl implements DistrictService {
return list;
}
@SuppressWarnings("unchecked")
public List<District> findNearestHasHouseDistrict(District district, int radiusMeters, int limit) {
String cacheKey = district.getCity() + "#" + district.getRegion() + "#" + district.getName() + "#" + radiusMeters + "#_if_sell_1" + limit;
Object obj = CacheUtils.getValue(this.getClass(), cacheKey);
if (obj != null) {
return (List<District>) obj;
}
ArrayList<District> list = new ArrayList<District>();
List<District> nlist = doFindNearestHasHouseDistrict(district, radiusMeters, limit);
if (nlist.size() > 0) {
list = (ArrayList<District>) nlist;
}
CacheUtils.putValue(CachePolicyEnum.LONG, this.getClass(), cacheKey, list);
return list;
}
public List<District> findNearestDistrict(District district, int radiusMeters, String[] fields, int limit) {
String cacheKey = district.getCity() + "#" + district.getRegion() + "#" + district.getName() + "#" + radiusMeters + "#" + limit;
@@ -2437,6 +2453,48 @@ public class DistrictServiceImpl implements DistrictService {
return new ArrayList<District>(ret);
}
public List<District> doFindNearestHasHouseDistrict(District district, int radiusMeters, int limit) {
if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0
|| district.getLng() <= 0) {
return Collections.EMPTY_LIST;
}
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("category", "district"));
params.add(new QueryParam("city", district.getCity()));
params.add(new QueryParam("visible", 0));
params.add(new QueryParam("ifSell", 1));
SdQuery sdQuery = new SdQuery();
sdQuery.setPoint((double) district.getLat() / 10000000000.0 + "," + (double) district.getLng() / 10000000000.0);
sdQuery.setField("lat_lng");
sdQuery.setDistance(String.valueOf((double) radiusMeters / 1000.0));
params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery));
List<District> list = districtDao.findAllByParams(params, null, 0, limit * 2,
new String[] { "city", "region", "name", "estateType2", "id" });
if (list.isEmpty()) {
return list;
}
List<District> ret = new ArrayList<District>();
for (District d : list) {
if (district.getName().equals(d.getName()) && district.getRegion().equals(d.getRegion())
&& district.getCity().equals(d.getCity())) {
continue;
}
if (d.getEstateType2() != null) {
if (d.getEstateType2().indexOf(district.getEstateType2()) > -1) {
ret.add(d);
}
}
}
if (ret.size() > limit) {
ret = ret.subList(0, limit);
}
return new ArrayList<District>(ret);
}
public List<District> doFindNearestDistrict(District district, int radiusMeters, String[] fields, int limit) {
if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0