Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into new_fjw

# Conflicts:
#	projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java
#	projects/fangjia-coresite/src/main/webapp/index.ftl
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
This commit is contained in:
2024-07-23 11:40:47 +08:00
371 changed files with 41387 additions and 7272 deletions
@@ -84,5 +84,9 @@ public interface AddressMatchProxyService {
* @return
*/
MatchDistrictResult checkMatchDistrictCorrect(CheckMatchDistrictCorrectParam param);
JSONObject addressStructure(String city, String address);
}
@@ -271,7 +271,27 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
}
return matchResult;
}
@Override
public JSONObject addressStructure(String city, String address) {
HttpRequest request = new HttpRequest();
JSONObject json = null;
Map<String, String> params = new HashMap<String, String>();
params.put("city", city);
params.put("address", address);
try {
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v2/structure", params, "UTF-8");
if (json != null && json.containsKey("msgCode") && json.getInt("msgCode") == 200) {
if (json.containsKey("result")) {
return (JSONObject) json.get("result");
}
}
}catch(Exception e){
LOGGER.error("地址标准化失败", e);
}
return null;
}
/**
* 获取高德中分数最高的信息
* @param city
@@ -353,7 +373,12 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
if (mapResult == null) {
matchResult.addDebugLog("格式化地址调百度重试开始");
mapResult = this.searchByBaiDu(city, formatAddress);
matchResult.addDebugLog("格式化地址调百度结果:" + mapResult != null ? mapResult.toString() : "");
if(null != mapResult){
matchResult.addDebugLog("格式化地址调百度结果:" + mapResult.toString());
}else{
matchResult.addDebugLog("格式化地址调百度结果:");
}
} else {
break;
}
@@ -0,0 +1,120 @@
package com.fangjia.service.bo;
import java.io.Serializable;
import java.util.Date;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioBo implements Serializable {
private static final long serialVersionUID = 1L;
private String id;
private String city_name;
private String region;
private String district;
private String building_name;
private String building_avg_price;
private String avg_price;
private Double ratio;
private Date c_date;
private Date m_date;
private String create_user;
private String note;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCity_name() {
return city_name;
}
public void setCity_name(String city_name) {
this.city_name = city_name;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getBuilding_name() {
return building_name;
}
public void setBuilding_name(String building_name) {
this.building_name = building_name;
}
public Double getRatio() {
return ratio;
}
public void setRatio(Double ratio) {
this.ratio = ratio;
}
public Date getC_date() {
return c_date;
}
public void setC_date(Date c_date) {
this.c_date = c_date;
}
public Date getM_date() {
return m_date;
}
public void setM_date(Date m_date) {
this.m_date = m_date;
}
public String getCreate_user() {
return create_user;
}
public void setCreate_user(String create_user) {
this.create_user = create_user;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getBuilding_avg_price() {
return building_avg_price;
}
public void setBuilding_avg_price(String building_avg_price) {
this.building_avg_price = building_avg_price;
}
public String getAvg_price() {
return avg_price;
}
public void setAvg_price(String avg_price) {
this.avg_price = avg_price;
}
}
@@ -18,6 +18,9 @@ public class Collateral {
@XStreamAlias("samples")
private List<Sample> sample;
private Integer maxPrice;
private Integer minPrice;
public String getCltNo() {
return cltNo;
}
@@ -33,4 +36,20 @@ public class Collateral {
public void setSample(List<Sample> sample) {
this.sample = sample;
}
public Integer getMaxPrice() {
return maxPrice;
}
public void setMaxPrice(Integer maxPrice) {
this.maxPrice = maxPrice;
}
public Integer getMinPrice() {
return minPrice;
}
public void setMinPrice(Integer minPrice) {
this.minPrice = minPrice;
}
}
@@ -31,4 +31,11 @@ public interface CzbankSampleService {
List<ShopSample> findShopSample(ShopCollateralSampleQueryBean queryBean, int max);
}
/**
* 北交所小区房源样本查询
* @param queryBeans
* @param max
* @return
*/
List<Collateral> findSample2(List<CollateralSampleQueryBean> queryBeans, int max);
}
@@ -6,6 +6,7 @@ import com.fangjia.dal.SdQuery;
import com.fangjia.dal.SortParam;
import com.fangjia.dal.common.DistrictKey;
import com.fangjia.dal.mongo.model.AgencyDistrictTradeRank;
import com.fangjia.dal.mongo.model.AliasFang;
import com.fangjia.dal.mongo.model.DistrictFacilitys;
import com.fangjia.dal.seaweed.model.District;
import com.fangjia.service.bo.DistrictInfo;
@@ -523,6 +524,10 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
List<District> findNearestDistrict(District district, int radiusMeters, int limit);
List<District> doFindNearestHasHouseDistrict(District district, int radiusMeters, int limit) ;
District findDistrictHasHouseFlag(District district);
List<District> findNearestDistrict(District district, int radiusMeters, String[] fields, int limit);
List<District> findNearestDistrict(String city, Double lng, Double lat, int radiusMeters, int limit);
@@ -536,10 +541,10 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
*
* @param city
* @param region
* @param masterDistrictNname
* @param masterDistrictName
* @return
*/
List<District> findSlaves(String city, String region, String masterDistrictNname);
List<District> findSlaves(String city, String region, String masterDistrictName);
/**
* 分期操作时设置此小区为人工操作标识
@@ -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,68 @@ 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);
}
@Override
public District findDistrictHasHouseFlag(District district) {
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("category", "district"));
params.add(new QueryParam("city", district.getCity()));
params.add(new QueryParam("region", district.getRegion()));
params.add(new QueryParam("name", district.getName()));
params.add(new QueryParam("visible", 0));
params.add(new QueryParam("ifSell", 1));
List<District> list = districtDao.findAllByParams(params, null, 0, 1, DISTRICT_MINI);
if (CollectionUtils.isEmpty(list)) {
return null;
}
if (list.size() == 1) {
return list.get(0);
}
return null;
}
public List<District> doFindNearestDistrict(District district, int radiusMeters, String[] fields, int limit) {
if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0
@@ -2639,12 +2717,12 @@ public class DistrictServiceImpl implements DistrictService {
}
@Override
public List<District> findSlaves(String city, String region, String masterDistrictNname) {
public List<District> findSlaves(String city, String region, String masterDistrictName) {
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("visible", 0));
params.add(new QueryParam("city", city));
params.add(new QueryParam("region", region));
params.add(new QueryParam("masterDistrictNname", masterDistrictNname));
params.add(new QueryParam("masterDistrictName", masterDistrictName));
return districtDao.findAllByParams(params);
}
@@ -2669,11 +2747,14 @@ public class DistrictServiceImpl implements DistrictService {
public Integer getCreateYear(District district) {
Integer buildYear = getYearFormDate(district.getCreateYear());
int minYear = Integer.MAX_VALUE;
if (buildYear != null && buildYear < minYear) {
minYear = buildYear;
// int minYear = Integer.MAX_VALUE;
if (buildYear != null && buildYear < Integer.MAX_VALUE) {
// minYear = buildYear;
return buildYear;
}else {
return null;
}
return minYear;
// return minYear;
}
public Integer getBuildYear(District district) {
@@ -2849,5 +2930,4 @@ public class DistrictServiceImpl implements DistrictService {
params.add(new QueryParam("$sr", new SrQuery(query)));
return districtDao.findAllByParams(params);
}
}
@@ -24,5 +24,5 @@ public interface DistrictUpdateTaskService {
void createTask(District district);
void createTask(District district, int status);
void createTask(District district, int status, Integer optType);
}
@@ -32,8 +32,8 @@ public class DistrictUpdateTaskServiceImpl implements DistrictUpdateTaskService
}
@Override
public void createTask(District district, int status) {
districtUpdateTaskDao.createTask(district, status);
public void createTask(District district, int status, Integer type) {
districtUpdateTaskDao.createTask(district, status, type);
}
@@ -225,7 +225,8 @@ public class DistrictTriggerServiceImpl implements TriggerService {
}
// 是否有二手房
if (districtHouseMap.get(districtKey) != null && districtHouseMap.get(districtKey).getSellCount() != null) {
if (districtHouseMap.get(districtKey) != null && districtHouseMap.get(districtKey).getSellCount() != null && districtHouseMap.get(districtKey).getSellCount().intValue()>0) {
LOGGER.warn("house count:"+districtHouseMap.get(districtKey).getSellCount());
newObj.put("if_sell", 1);
} else {
newObj.put("if_sell", 0);
@@ -70,9 +70,9 @@ public class SellTriggerServiceImpl implements TriggerService {
for (BSONObject object : bSONDocList) {
try {
ServerArea city = ServerAreaData.getServerAreaByDisplayDefaultNull(String.valueOf(object.get("city")));
// DistrictKey districtKey = new DistrictKey((String) object.get("city"), (String) object.get("region"),
// (String) object.get("district_name"));
// District district = districtMap.get(districtKey);
DistrictKey districtKey = new DistrictKey((String) object.get("city"), (String) object.get("region"),
(String) object.get("district_name"));
District district = districtMap.get(districtKey);
// if (district != null && district.getName() != null) {
// districtKey = new DistrictKey(district.getCity(), district.getRegion(),district.getName());
// }
@@ -156,17 +156,20 @@ public class SellTriggerServiceImpl implements TriggerService {
newObj.put("fitment", object.get("fitment"));
newObj.put("contact_people", object.get("contact_people"));
ScoreCalculatorInputData inputDate = new ScoreCalculatorInputData();
// if (district != null) {
// newObj.put("region", district.getRegion());
// if (StringUtils.isNotBlank(district.getBlock())) {
// newObj.put("block", district.getBlock());
// }
// if (district.getName() != null) {
// newObj.put("districtname_key", district.getName() + "_" + newObj.get("region") + "_" + object.get("city"));
// newObj.put("district_name", district.getName());
// }
// }
if (district != null) {
newObj.put("region", district.getRegion());
if (StringUtils.isNotBlank(district.getBlock())) {
newObj.put("block", district.getBlock());
}
if (district.getName() != null) {
newObj.put("districtname_key", district.getName() + "_" + newObj.get("region") + "_" + object.get("city"));
newObj.put("district_name", district.getName());
}
}else{
if(object.containsField("city") && object.containsField("district_name") && object.containsField("region")){
newObj.put("districtname_key", object.get("district_name") + "_" + object.get("region") + "_" + object.get("city"));
}
}
// newObj.put("if_school", 0);
// if (districtSchoolMap != null && districtSchoolMap.containsKey(districtKey)) {
// List<SchoolKey> skList = districtSchoolMap.get(districtKey);
@@ -0,0 +1,18 @@
package com.fangjia.service.mongo.bkoff;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
import java.util.List;
import java.util.Map;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public interface BuildingRatioService {
public void save(BuildingRatio buildingRatio);
public void deleteById(String id);
public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map<String, Object> data);
public BuildingRatio findBuildingRatioById(String id);
public List<BuildingRatio> findAllByBuildingName(String city, String region, String district, String building_name);
}
@@ -0,0 +1,81 @@
package com.fangjia.service.mongo.bkoff;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.SortParam;
import com.fangjia.dal.mongo.dao.bkoff.BuildingRatioDao;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
import com.fangjia.dal.sql.model.FjtUsers;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioServiceImpl implements BuildingRatioService{
private BuildingRatioDao buildingRatioDao;
@Override
public void save(BuildingRatio buildingRatio) {
this.buildingRatioDao.save(buildingRatio);
}
@Override
public void deleteById(String id) {
this.buildingRatioDao.deleteById(id);
}
@Override
public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map<String, Object> data) {
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("city", city));
params.add(new QueryParam("region", region));
params.add(new QueryParam("district", district));
params.add(new QueryParam("building_name", building_name));
data.put("city", city);
data.put("region", region);
data.put("district", district);
data.put("building_name", building_name);
this.buildingRatioDao.updateByParams(data, params, true);
}
@Override
public BuildingRatio findBuildingRatioById(String id) {
return this.buildingRatioDao.findById(id);
}
@Override
public List<BuildingRatio> findAllByBuildingName(String city, String region, String district, String building_name) {
List<QueryParam> params = new ArrayList<QueryParam>();
if(StringUtils.isNotBlank(city)){
params.add(new QueryParam("city", city));
}
if(StringUtils.isNotBlank(region)){
params.add(new QueryParam("region", region));
}
if(StringUtils.isNotBlank(district)){
params.add(new QueryParam("district", district));
}
if(StringUtils.isNotBlank(building_name)){
params.add(new QueryParam("building_name", building_name));
}
List<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("m_date", false));
return this.buildingRatioDao.findAllByParams(params, sortParams);
}
public BuildingRatioDao getBuildingRatioDao() {
return buildingRatioDao;
}
public void setBuildingRatioDao(BuildingRatioDao buildingRatioDao) {
this.buildingRatioDao = buildingRatioDao;
}
}
@@ -0,0 +1,17 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
/**
* Created by ideoj on 2016/9/5.
*/
public interface AdministrativeDivisionService {
/**
* 根据code获取城市
* @param code
* @return
*/
AdministrativeDivision findcityByCode(String code);
}
@@ -0,0 +1,20 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.mongo.dao.AdministrativeDivisionDao;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
public class AdministrativeDivisionServiceImpl implements AdministrativeDivisionService{
private AdministrativeDivisionDao administrativeDivisionDao;
@Override
public AdministrativeDivision findcityByCode(String code) {
return administrativeDivisionDao.findcityByCode(code);
}
public void setAdministrativeDivisionDao(AdministrativeDivisionDao administrativeDivisionDao) {
this.administrativeDivisionDao = administrativeDivisionDao;
}
}
@@ -0,0 +1,61 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import org.sothis.core.util.Pager;
import java.util.List;
import java.util.Map;
/**
* Created by dxy on 2015/6/8.
*/
public interface DevelopmentZoneService {
/**
* 保存
*
* @param developmentZone
*/
public void saveDevelopmentZone(DevelopmentZone developmentZone);
/**
* 删除
*
* @param id
*/
public void deleteDevelopmentZone(String id);
/**
* 更新
*
* @param id
* @param udata
*/
public void updateDevelopmentZone(Map<String,Object> udata, String id);
/**
* 根据ID查询
*
* @param id
* @return
*/
public DevelopmentZone findDevelopmentZone(String id);
/**
* 分页查找
*
* @param province
* @param name
* @param pager
* @return
*/
public List<DevelopmentZone> findDevelopmentZone(String province,String name,String level, Pager pager);
public long countDev(String province,String name,String level);
public List<String> findProvinces();
public List<String> findCities(String province);
public List<String> findDistricts(String city);
}
@@ -0,0 +1,128 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.dao.AdministrativeMappingDao;
import com.fangjia.dal.mongo.dao.DevelopmentZoneDao;
import com.fangjia.dal.mongo.model.AdministrativeMapping;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
private DevelopmentZoneDao developmentZoneDao;
private AdministrativeMappingDao administrativeMappingDao;
@Override
public void saveDevelopmentZone(DevelopmentZone DevelopmentZone) {
developmentZoneDao.save(DevelopmentZone);
}
@Override
public void deleteDevelopmentZone(String id) {
developmentZoneDao.deleteById(id);
}
@Override
public void updateDevelopmentZone(Map<String,Object> map,String id) {
developmentZoneDao.updateById(map,id);
}
@Override
public DevelopmentZone findDevelopmentZone(String id) {
return developmentZoneDao.findById(id);
}
@Override
public List<DevelopmentZone> findDevelopmentZone(String province,String name,String level, Pager pager) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(name)) {
Pattern pattern = Pattern.compile(".*" + name + ".*");
params.add(new QueryParam("name", pattern));
}
if (StringUtils.isNotBlank(level)) {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
return developmentZoneDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize());
}
@Override
public long countDev(String province, String name,String level) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(name)) {
Pattern pattern = Pattern.compile(".*" + name + ".*");
params.add(new QueryParam("name", pattern));
}
if (StringUtils.isNotBlank(level)) {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
return developmentZoneDao.findCountByParams(params);
}
@Override
public List<String> findProvinces() {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "Ê¡·Ý"));
List<AdministrativeMapping> allProvince = administrativeMappingDao.findAllByParams(queryParams,null,0,100,new String[]{"province"});
List<String> provinces = new ArrayList<String>();
for (AdministrativeMapping mapping : allProvince) {
provinces.add(mapping.getProvince());
}
return provinces;
}
@Override
public List<String> findCities(String province) {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "³ÇÊÐ"));
queryParams.add(new QueryParam("province", province));
List<AdministrativeMapping> allCity = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"city"});
List<String> cities = new ArrayList<String>();
for (AdministrativeMapping mapping : allCity) {
cities.add(mapping.getCity());
}
return cities;
}
@Override
public List<String> findDistricts(String city) {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("type", "ÇøÓò"));
queryParams.add(new QueryParam("city", city));
List<AdministrativeMapping> allDistrict = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"district"});
List<String> districts = new ArrayList<String>();
for (AdministrativeMapping mapping : allDistrict) {
districts.add(mapping.getDistrict());
}
return districts;
}
public void setDevelopmentZoneDao(DevelopmentZoneDao developmentZoneDao) {
this.developmentZoneDao = developmentZoneDao;
}
public void setAdministrativeMappingDao(AdministrativeMappingDao administrativeMappingDao) {
this.administrativeMappingDao = administrativeMappingDao;
}
}
@@ -0,0 +1,49 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.mongo.model.Township;
import org.sothis.core.util.Pager;
import java.util.List;
import java.util.Map;
/**
* Created by dxy on 2015/6/8.
*/
public interface TownshipService {
/**
* ¸üÐÂ
*
* @param id
* @param udata
*/
public void updateTownship(Map<String, Object> udata, String id);
/**
*
* @param province
* @param city
* @param district
* @param pager
* @return
*/
public List<Township> findTownship(String province, String city, String district,String street, Pager pager);
/**
* ͳ¼ÆÊýÁ¿
* @param province
* @param city
* @param district
* @return
*/
public long countTownship(String province, String city, String district,String street);
/**
* ¸ù¾ÝID²éÕÒ
* @param id
* @return
*/
public Township findTownship(String id);
}
@@ -0,0 +1,93 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.dao.AdministrativeMappingDao;
import com.fangjia.dal.mongo.dao.TownshipDao;
import com.fangjia.dal.mongo.model.Township;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class TownshipServiceImpl implements TownshipService {
private TownshipDao townshipDao;
@Override
public void updateTownship(Map<String,Object> map,String id) {
townshipDao.updateById(map,id);
}
@Override
public List<Township> findTownship(String province, String city, String district,String street, Pager pager) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(city)) {
Pattern pattern = Pattern.compile(".*" + city + ".*");
params.add(new QueryParam("city1", pattern));
}
if (StringUtils.isNotBlank(district)) {
Pattern pattern = Pattern.compile(".*" + district + ".*");
params.add(new QueryParam("district", pattern));
}
if (StringUtils.isNotBlank(street)) {
Pattern pattern = Pattern.compile(".*" + street + ".*");
BasicDBList orList = new BasicDBList();
orList.add(new BasicDBObject("alias", pattern));
orList.add(new BasicDBObject("street", pattern));
params.add(new QueryParam("$or",orList));
}
params.add(new QueryParam("type","乡镇街道"));
return townshipDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize());
}
@Override
public long countTownship(String province, String city,String district,String street) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(city)) {
Pattern pattern = Pattern.compile(".*" + city + ".*");
params.add(new QueryParam("city1", pattern));
}
if (StringUtils.isNotBlank(district)) {
Pattern pattern = Pattern.compile(".*" + district + ".*");
params.add(new QueryParam("district", pattern));
}
if (StringUtils.isNotBlank(street)) {
Pattern pattern = Pattern.compile(".*" + street + ".*");
//mongo or查询方法
BasicDBList orList = new BasicDBList();
orList.add(new BasicDBObject("alias", pattern));
orList.add(new BasicDBObject("street", pattern));
params.add(new QueryParam("$or",orList));
}
params.add(new QueryParam("type","乡镇街道"));
return townshipDao.findCountByParams(params);
}
@Override
public Township findTownship(String id) {
return townshipDao.findById(id);
}
public void setTownshipDao(TownshipDao townshipDao) {
this.townshipDao = townshipDao;
}
}
@@ -0,0 +1,21 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
import org.sothis.core.util.Pager;
import java.util.List;
import java.util.Map;
/**
* Created by dxy on 2015/6/8.
*/
public interface VillageIdentifyService {
void updateByparams(Map<String, Object> data, List<QueryParam> params);
int count(String villageType,String city1,String address);
List<VillageIdentify> findAll(String villageType,String city1,String address,Pager pager);
}
@@ -0,0 +1,68 @@
package com.fangjia.service.mongo.fangjia;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.dao.TownshipDao;
import com.fangjia.dal.mongo.dao.VillageIdentifyDao;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class VillageIdentifyServiceImpl implements VillageIdentifyService {
private VillageIdentifyDao villageIdentifyDao;
@Override
public void updateByparams(Map<String, Object> data, List<QueryParam> params) {
villageIdentifyDao.updateByParams(data, params, true);
}
@Override
public int count(String villageType, String city1, String address) {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(villageType)) {
queryParams.add(new QueryParam("villageType", villageType));
}else {
queryParams.add(new QueryParam("villageType", "¶Ô¹«"));
}
if (StringUtils.isNotBlank(city1)) {
Pattern pattern = Pattern.compile(".*" + city1 + ".*");
queryParams.add(new QueryParam("cityParam", pattern));
}
if (StringUtils.isNotBlank(address)) {
Pattern pattern = Pattern.compile(".*" + address + ".*");
queryParams.add(new QueryParam("address", pattern));
}
return (int) villageIdentifyDao.findCountByParams(queryParams);
}
@Override
public List<VillageIdentify> findAll(String villageType, String city1, String address, Pager pager) {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(villageType)) {
queryParams.add(new QueryParam("villageType", villageType));
}else {
queryParams.add(new QueryParam("villageType", "¶Ô¹«"));
}
if (StringUtils.isNotBlank(city1)) {
Pattern pattern = Pattern.compile(".*" + city1 + ".*");
queryParams.add(new QueryParam("cityParam", pattern));
}
if (StringUtils.isNotBlank(address)) {
Pattern pattern = Pattern.compile(".*" + address + ".*");
queryParams.add(new QueryParam("address", pattern));
}
return villageIdentifyDao.findAllByParams(queryParams, pager.getStartRow(), pager.getPageSize());
}
public void setVillageIdentifyDao(VillageIdentifyDao villageIdentifyDao) {
this.villageIdentifyDao = villageIdentifyDao;
}
}
@@ -0,0 +1,23 @@
package com.fangjia.service.open;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public interface AliasFangService {
/**
* 查询搜房别名与名称关系
*
* @param city
* @param region
* @param names
* @return
*/
List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names);
}
@@ -0,0 +1,27 @@
package com.fangjia.service.open;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.dao.AliasFangDao;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public class AliasFangServiceImpl implements AliasFangService{
private AliasFangDao aliasFangDao;
@Override
public List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names) {
return aliasFangDao.findFangByNameAndAlias(city, region, names);
}
public void setAliasFangDao(AliasFangDao aliasFangDao) {
this.aliasFangDao = aliasFangDao;
}
}
@@ -26,6 +26,7 @@ public class ApiUserBo implements Serializable {
private Date deadTime;
private String manager;
private String priceType;
private Integer isMonitor;
public String getPriceType() {
return priceType;
@@ -162,4 +163,12 @@ public class ApiUserBo implements Serializable {
public void setManager(String manager) {
this.manager = manager;
}
public Integer getIsMonitor() {
return isMonitor;
}
public void setIsMonitor(Integer isMonitor) {
this.isMonitor = isMonitor;
}
}
@@ -4,6 +4,7 @@ import com.fangjia.dal.QueryParam;
import com.fangjia.dal.SortParam;
import com.fangjia.dal.mongo.open.dao.OpenUriLogDao;
import com.fangjia.dal.mongo.tool.model.OpenUriLog;
import com.fangjia.service.util.kafka.KafkaProducerUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -13,9 +14,12 @@ import java.util.List;
public class OpenUriLogServiceImpl implements OpenUriLogService {
private OpenUriLogDao openUriLogDao;
private KafkaProducerUtils kafkaProducerUtils;
public void save(OpenUriLog openUriLog) {
this.openUriLogDao.save(openUriLog);
// 改造为向Kafka中发送消息
kafkaProducerUtils.sendLog(openUriLog);
}
@Override
@@ -95,5 +99,7 @@ public class OpenUriLogServiceImpl implements OpenUriLogService {
this.openUriLogDao = openUriLogDao;
}
public void setKafkaProducerUtils(KafkaProducerUtils kafkaProducerUtils) {
this.kafkaProducerUtils = kafkaProducerUtils;
}
}
@@ -61,5 +61,6 @@ public interface ApiUserService {
* @return
*/
User findUserById(Long id);
void clearApiUserAuthorityCache(long userId);
}
@@ -0,0 +1,43 @@
package com.fangjia.service.util.kafka;
import com.alibaba.fastjson.JSONObject;
import com.fangjia.dal.mongo.tool.model.OpenUriLog;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringSerializer;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Service;
import java.util.Properties;
@Configuration
@Service
public class KafkaProducerUtils implements DisposableBean {
public final KafkaProducer<String, String> producer;
public KafkaProducerUtils() {
Properties properties = new Properties();
properties.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "192.168.0.100:30092");
properties.setProperty(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
properties.setProperty(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
this.producer = new KafkaProducer<String, String>(properties);
}
public void sendLog(OpenUriLog openUriLog) {
try {
String msg = JSONObject.toJSONString(openUriLog);
ProducerRecord<String, String> record = new ProducerRecord<String, String>("log-data-topic", msg);
this.producer.send(record);
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
public void destroy() throws Exception {
producer.close();
}
}