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
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.dao.AdministrativeMappingDao;
import com.fangjia.dal.mongo.model.AdministrativeMapping;
public class AdministrativeMappingDaoImpl extends MongoDaoImpl<AdministrativeMapping> implements AdministrativeMappingDao {
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
import com.fangjia.dal.MongoDao;
public interface AdministrativeDivisionDao extends MongoDao<AdministrativeDivision> {
AdministrativeDivision findcityByCode(String code);
}
@@ -0,0 +1,23 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.QueryParam;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
public class AdministrativeDivisionDaoImpl extends MongoDaoImpl<AdministrativeDivision> implements AdministrativeDivisionDao {
@Override
public AdministrativeDivision findcityByCode(String code) {
if (StringUtils.isBlank(code)) {
return new AdministrativeDivision();
}
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code));
params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "³ÇÊÐ"));
return (AdministrativeDivision) findFirstByParams(params);
}
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.AdministrativeMapping;
public interface AdministrativeMappingDao extends MongoDao<AdministrativeMapping> {
}
@@ -0,0 +1,16 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public interface AliasFangDao extends MongoDao<AliasFang> {
List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names);
}
@@ -0,0 +1,40 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.model.AliasFang;
import com.fangjia.dal.mongo.model.ConsumerAddress;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
public class AliasFangDaoImpl extends MongoDaoImpl<AliasFang> implements AliasFangDao{
@Override
public List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names) {
DBObject query = new BasicDBObject();
if (StringUtils.isNotBlank(city)) {
query.put("city", city);
}
if (StringUtils.isNotBlank(region)) {
query.put("region", region);
}
// db.alias_fang.find({'city': 'ÖØÇì', 'region': 'Óå±±', $or: [{'name': 'ÖйúĦ'}, {'alias': 'ÖйúĦ'}]})
if(CollectionUtils.isNotEmpty(names)) {
BasicDBList dbList = new BasicDBList();
dbList.add(new BasicDBObject("name", new BasicDBObject("$in", names)));
dbList.add(new BasicDBObject("alias", new BasicDBObject("$in", names)));
query.put("$or", dbList);
}
List<AliasFang> objs = find(query, null, null, 0, Integer.MAX_VALUE);
return objs;
}
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.LatlngPolygon;
public interface DevelopmentZoneDao extends MongoDao<DevelopmentZone> {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.LatlngPolygon;
public class DevelopmentZoneDaoImpl extends MongoDaoImpl<DevelopmentZone> implements DevelopmentZoneDao {
}
@@ -22,6 +22,6 @@ public interface DistrictUpdateTaskDao extends MongoDao<DistrictUpdateTask> {
void createTask(District district);
void createTask(District district, int status);
void createTask(District district, int status, Integer type);
}
@@ -87,7 +87,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
}
@Override
public void createTask(District district, int status) {
public void createTask(District district, int status, Integer type) {
DistrictUpdateTask task = new DistrictUpdateTask();
task.setCity(district.getCity());
task.setRegion(district.getRegion());
@@ -99,6 +99,12 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
}else{
task.setEstateType("district");
}
if(null != type){
task.setType(type);
}
if(StringUtils.isNotBlank(district.getId())){
task.setCommId(district.getId());
}
this.save(task);
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.Township;
public interface TownshipDao extends MongoDao<Township> {
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.Township;
public class TownshipDaoImpl extends MongoDaoImpl<Township> implements TownshipDao {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
public interface VillageIdentifyDao extends MongoDao<VillageIdentify> {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
public class VillageIdentifyDaoImpl extends MongoDaoImpl<VillageIdentify> implements VillageIdentifyDao {
}
@@ -0,0 +1,12 @@
package com.fangjia.dal.mongo.dao.bkoff;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.bkoff.AveragerConfig;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public interface BuildingRatioDao extends MongoDao<BuildingRatio> {
}
@@ -0,0 +1,12 @@
package com.fangjia.dal.mongo.dao.bkoff;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.bkoff.AveragerConfig;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioDaoImpl extends MongoDaoImpl<BuildingRatio> implements BuildingRatioDao {
}
@@ -0,0 +1,148 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.DatastoreCategory;
import com.fangjia.dal.MongoEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "fangjia.administrative_division")
public class AdministrativeDivision implements MongoEntity {
private static final long serialVersionUID = -8379446820760559477L;
private String id;
private String province;
private String city;
private String district;
private String mcaProvinceCode;
private String mcaDistrictCode;
private String mcaCityCode;
private String level;
private String cityShort;
private String distShort;
private String provShort;
private String code;
private String administer;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "mca_province_code")
public String getMcaProvinceCode() {
return mcaProvinceCode;
}
public void setMcaProvinceCode(String mcaProvinceCode) {
this.mcaProvinceCode = mcaProvinceCode;
}
@Column(name = "mca_district_code")
public String getMcaDistrictCode() {
return mcaDistrictCode;
}
public void setMcaDistrictCode(String mcaDistrictCode) {
this.mcaDistrictCode = mcaDistrictCode;
}
@Column(name = "mca_city_code")
public String getMcaCityCode() {
return mcaCityCode;
}
public void setMcaCityCode(String mcaCityCode) {
this.mcaCityCode = mcaCityCode;
}
@Column(name = "level")
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "dist_short")
public String getDistShort() {
return distShort;
}
public void setDistShort(String distShort) {
this.distShort = distShort;
}
@Column(name = "prov_short")
public String getProvShort() {
return provShort;
}
public void setProvShort(String provShort) {
this.provShort = provShort;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getAdminister() {
return administer;
}
public void setAdminister(String administer) {
this.administer = administer;
}
}
@@ -0,0 +1,255 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.List;
@Entity
@Table(name = "business.administrative_mapping")
public class AdministrativeMapping implements MongoEntity {
private String id;
private String province;
private String city;
private String district;
private String street;
private String tjjStreetCode;
private String streetPinyin;
private String pid;
private String tjjProvinceCode;
private String tjjCityCode;
private String tjjDistrictCode;
private Integer tjjSourceYear;
private String mzbProvinceCode;
private String mzbCityCode;
private String mzbDistrictCode;
private String mzbDistrictName;
private String mzbStreetCode;
private Integer mzbSourceYear;
private String type;
private String districtShort;
private String cityShort;
private String provinceShort;
private List<String> alias;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "city")
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "street")
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
@Column(name = "pid")
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
@Column(name = "tjj_province_code")
public String getTjjProvinceCode() {
return tjjProvinceCode;
}
public void setTjjProvinceCode(String tjjProvinceCode) {
this.tjjProvinceCode = tjjProvinceCode;
}
@Column(name = "tjj_city_code")
public String getTjjCityCode() {
return tjjCityCode;
}
public void setTjjCityCode(String tjjCityCode) {
this.tjjCityCode = tjjCityCode;
}
@Column(name = "tjj_district_code")
public String getTjjDistrictCode() {
return tjjDistrictCode;
}
public void setTjjDistrictCode(String tjjDistrictCode) {
this.tjjDistrictCode = tjjDistrictCode;
}
@Column(name = "tjj_street_code")
public String getTjjStreetCode() {
return tjjStreetCode;
}
public void setTjjStreetCode(String tjjStreetCode) {
this.tjjStreetCode = tjjStreetCode;
}
@Column(name = "tjj_source_year")
public Integer getTjjSourceYear() {
return tjjSourceYear;
}
public void setTjjSourceYear(Integer tjjSourceYear) {
this.tjjSourceYear = tjjSourceYear;
}
@Column(name = "mzb_province_code")
public String getMzbProvinceCode() {
return mzbProvinceCode;
}
public void setMzbProvinceCode(String mzbProvinceCode) {
this.mzbProvinceCode = mzbProvinceCode;
}
@Column(name = "mzb_city_code")
public String getMzbCityCode() {
return mzbCityCode;
}
public void setMzbCityCode(String mzbCityCode) {
this.mzbCityCode = mzbCityCode;
}
@Column(name = "mzb_district_code")
public String getMzbDistrictCode() {
return mzbDistrictCode;
}
public void setMzbDistrictCode(String mzbDistrictCode) {
this.mzbDistrictCode = mzbDistrictCode;
}
@Column(name = "mzb_district_name")
public String getMzbDistrictName() {
return mzbDistrictName;
}
public void setMzbDistrictName(String mzbDistrictName) {
this.mzbDistrictName = mzbDistrictName;
}
@Column(name = "mzb_street_code")
public String getMzbStreetCode() {
return mzbStreetCode;
}
public void setMzbStreetCode(String mzbStreetCode) {
this.mzbStreetCode = mzbStreetCode;
}
@Column(name = "mzb_source_year")
public Integer getMzbSourceYear() {
return mzbSourceYear;
}
public void setMzbSourceYear(Integer mzbSourceYear) {
this.mzbSourceYear = mzbSourceYear;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "district_short")
public String getDistrictShort() {
return districtShort;
}
public void setDistrictShort(String districtShort) {
this.districtShort = districtShort;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "province_short")
public String getProvinceShort() {
return provinceShort;
}
public void setProvinceShort(String provinceShort) {
this.provinceShort = provinceShort;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
@Column(name = "street_pinyin")
public String getStreetPinyin() {
return streetPinyin;
}
public void setStreetPinyin(String streetPinyin) {
this.streetPinyin = streetPinyin;
}
}
@@ -0,0 +1,68 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
/**
* ËÑ·¿Ãû³ÆÓë±ðÃû¹ØÏµ
*/
@Entity
@Table(name = "business.alias_fang")
public class AliasFang implements MongoEntity {
private String id;
private String city;
private String region;
private String name;
private String alias;
@Override
@Id
@GeneratedValue
@Column(name = "_id", unique = true, nullable = false)
public String getId() {
return id;
}
@Override
public void setId(String id) {
this.id = id;
}
@Column(name = "city")
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
@Column(name = "region")
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "alias")
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
}
@@ -0,0 +1,219 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Entity
@Table(name = "fangjia_base.development_zone")
public class DevelopmentZone implements MongoEntity {
private String id;
private String address;
private String buildDate;
private Date createTime;
private String industry;
private String area;
private String level;
private String name;
private String nameEn;
private String province;
private String type;
private String url;
// 高德经纬度
private Map<String, Object> shape;
// 百度经纬度
private Map<String, Object> bdShape;
private String block;
private String operator;
private String cityName1;
private String district;
//增加别名字段
private List<String> alias;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "address")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Column(name = "build_date")
public String getBuildDate() {
return buildDate;
}
public void setBuildDate(String buildDate) {
this.buildDate = buildDate;
}
@Column(name = "create_time")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Column(name = "industry")
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
@Column(name = "level")
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "name_en")
public String getNameEn() {
return nameEn;
}
public void setNameEn(String nameEn) {
this.nameEn = nameEn;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "url")
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
@Column(name = "shape")
public Map<String, Object> getShape() {
return shape;
}
public void setShape(Map<String, Object> shape) {
this.shape = shape;
}
@Column(name = "bd_shape")
public Map<String, Object> getBdShape() {
return bdShape;
}
public void setBdShape(Map<String, Object> bdShape) {
this.bdShape = bdShape;
}
@Column(name = "area")
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
@Column(name = "block")
public String getBlock() {
return block;
}
public void setBlock(String block) {
this.block = block;
}
@Column(name = "operator")
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
@Column(name = "city")
public String getCityName1() {
return cityName1;
}
public void setCityName1(String cityName1) {
this.cityName1 = cityName1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
}
@@ -184,7 +184,7 @@ public class DistrictFacilitys implements MongoEntity {
this.bus = bus;
}
@Column(name = "metro")
@Column(name = "subway")
public List<String> getMetro() {
return metro;
}
@@ -27,6 +27,7 @@ public class DistrictUpdateTask implements MongoEntity {
private Integer status; // 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 5:新增小区
private String msg;
private String estateType;
private String commId;
@Id
@GeneratedValue
@@ -121,4 +122,12 @@ public class DistrictUpdateTask implements MongoEntity {
public void setNewCity(String newCity) {
this.newCity = newCity;
}
@Column(name="comm_id")
public String getCommId() {
return commId;
}
public void setCommId(String commId) {
this.commId = commId;
}
}
@@ -0,0 +1,328 @@
package com.fangjia.dal.mongo.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "business.administrative_mapping")
public class Township implements MongoEntity {
private String province;
private String city1;
private String district;
private String street;
private String pid;
private String id;
@JSONField(name = "tjj_province_code")
private String tjjProvinceCode;
@JSONField(name = "tjj_city_code")
private String tjjCityCode;
@JSONField(name = "tjj_district_code")
private String tjjDistrictCode;
@JSONField(name = "tjj_street_code")
private String tjjStreetCode;
@JSONField(name = "tjj_source_year")
private Integer tjjSourceYear;
@JSONField(name = "mzb_province_code")
private String mzbProvinceCode;
@JSONField(name = "mzb_city_code")
private String mzbCityCode;
@JSONField(name = "mzb_district_code")
private String mzbDistrictCode;
@JSONField(name = "mzb_district_name")
private String mzbDistrictName;
@JSONField(name = "mzb_street_code")
private String mzbStreetCode;
private String type;
private List<String> alias;
@JSONField(name = "street_pinyin")
private String streetPinyin;
//民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题
@JSONField(name = "district_diff")
private Integer districtDiff;
//乡镇街道是否输出 0:不输出 1:输出
@JSONField(name = "street_output")
private Integer streetOutput;
@JSONField(name = "province_short")
private String provinceShort;
@JSONField(name = "city_short")
private String cityShort;
@JSONField(name = "district_short")
private String districtShort;
private String operator;
private Date createTime;
private Date updateTime;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "city")
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "street")
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
@Column(name = "pid")
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
@Column(name = "tjj_province_code")
public String getTjjProvinceCode() {
return tjjProvinceCode;
}
public void setTjjProvinceCode(String tjjProvinceCode) {
this.tjjProvinceCode = tjjProvinceCode;
}
@Column(name = "tjj_city_code")
public String getTjjCityCode() {
return tjjCityCode;
}
public void setTjjCityCode(String tjjCityCode) {
this.tjjCityCode = tjjCityCode;
}
@Column(name = "tjj_district_code")
public String getTjjDistrictCode() {
return tjjDistrictCode;
}
public void setTjjDistrictCode(String tjjDistrictCode) {
this.tjjDistrictCode = tjjDistrictCode;
}
@Column(name = "tjj_street_code")
public String getTjjStreetCode() {
return tjjStreetCode;
}
public void setTjjStreetCode(String tjjStreetCode) {
this.tjjStreetCode = tjjStreetCode;
}
@Column(name = "tjj_source_year")
public Integer getTjjSourceYear() {
return tjjSourceYear;
}
public void setTjjSourceYear(Integer tjjSourceYear) {
this.tjjSourceYear = tjjSourceYear;
}
@Column(name = "mzb_province_code")
public String getMzbProvinceCode() {
return mzbProvinceCode;
}
public void setMzbProvinceCode(String mzbProvinceCode) {
this.mzbProvinceCode = mzbProvinceCode;
}
@Column(name = "mzb_city_code")
public String getMzbCityCode() {
return mzbCityCode;
}
public void setMzbCityCode(String mzbCityCode) {
this.mzbCityCode = mzbCityCode;
}
@Column(name = "mzb_district_code")
public String getMzbDistrictCode() {
return mzbDistrictCode;
}
public void setMzbDistrictCode(String mzbDistrictCode) {
this.mzbDistrictCode = mzbDistrictCode;
}
@Column(name = "mzb_district_name")
public String getMzbDistrictName() {
return mzbDistrictName;
}
public void setMzbDistrictName(String mzbDistrictName) {
this.mzbDistrictName = mzbDistrictName;
}
@Column(name = "mzb_street_code")
public String getMzbStreetCode() {
return mzbStreetCode;
}
public void setMzbStreetCode(String mzbStreetCode) {
this.mzbStreetCode = mzbStreetCode;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
@Column(name = "street_pinyin")
public String getStreetPinyin() {
return streetPinyin;
}
public void setStreetPinyin(String streetPinyin) {
this.streetPinyin = streetPinyin;
}
@Column(name = "district_diff")
public Integer getDistrictDiff() {
return districtDiff;
}
public void setDistrictDiff(Integer districtDiff) {
this.districtDiff = districtDiff;
}
@Column(name = "street_output")
public Integer getStreetOutput() {
return streetOutput;
}
public void setStreetOutput(Integer streetOutput) {
this.streetOutput = streetOutput;
}
@Column(name = "province_short")
public String getProvinceShort() {
return provinceShort;
}
public void setProvinceShort(String provinceShort) {
this.provinceShort = provinceShort;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "district_short")
public String getDistrictShort() {
return districtShort;
}
public void setDistrictShort(String districtShort) {
this.districtShort = districtShort;
}
@Column(name = "operator")
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
@Column(name = "c_date")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Column(name = "m_date")
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
@@ -0,0 +1,442 @@
package com.fangjia.dal.mongo.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "fangjia.village_identify_result")
public class VillageIdentify implements MongoEntity {
@Id
@JSONField(name = "_id")
private String id;
@JSONField(name = "address")
private String address;
@JSONField(name = "province")
private String province;
@JSONField(name = "city")
private String city1;
@JSONField(name = "city_param")
private String cityParam;
@JSONField(name = "district")
private String district;
@JSONField(name = "town")
private String town;
@JSONField(name = "committee")
private String committee;
@JSONField(name = "type")
private String type;
@JSONField(name = "province_code")
private String provinceCode;
@JSONField(name = "city_code")
private String cityCode;
@JSONField(name = "district_code")
private String districtCode;
@JSONField(name = "town_code")
private String townCode;
@JSONField(name = "committee_code")
private String committeeCode;
@JSONField(name = "type_code")
private String typeCode;
@JSONField(name = "type_name")
private String typeName;
@JSONField(name = "verify_flag")
private String verifyFlag;//涉农标识
@JSONField(name = "addr_verify")
private String addrVerify;//地址是否有效信息
@JSONField(name = "county_level_city")
private String countyLevelCity;//是否为县级市
@JSONField(name = "administrative_towns")
private String administrativeTowns;//是否市辖建制镇
@JSONField(name = "county_gov")
private String countyGov;//是否为县政府
@JSONField(name = "dev_district")
private String devDistrict;//是否为开发区
@JSONField(name = "dev_district_name")
private String devDistrictName;//开发区
@JSONField(name = "dev_level")
private String devLevel;//开发区等级
@JSONField(name = "lat")
private Double lat;
@JSONField(name = "lng")
private Double lng;
@JSONField(name = "addr_area")
private String addrArea;
//测试时使用
@JSONField(name = "split_committee")
private String splitCommittee;
@JSONField(name = "split_street")
private String splitStreet;
@JSONField(name = "poi_name")
private String poiName;
@JSONField(name = "split_street_num")
private String splitStreetNum;
@JSONField(name = "dev")
private String dev;
@JSONField(name = "community_source")
private String communitySource;//居委来源
@JSONField(name = "match_poi_name")
private String matchPoiName;//匹配poi的名称
@JSONField(name = "region_info")
private String regionInfo;//围栏区域信息
@JSONField(name = "tjj_district_name")
private String tjjDistrictName;
@JSONField(name = "village_type")
private String villageType;
@JSONField(name = "c_date")
private Date createTime;
@Column(name = "address")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "city")
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "town")
public String getTown() {
return town;
}
public void setTown(String town) {
this.town = town;
}
@Column(name = "committee")
public String getCommittee() {
return committee;
}
public void setCommittee(String committee) {
this.committee = committee;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "province_code")
public String getProvinceCode() {
return provinceCode;
}
public void setProvinceCode(String provinceCode) {
this.provinceCode = provinceCode;
}
@Column(name = "city_code")
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
@Column(name = "district_code")
public String getDistrictCode() {
return districtCode;
}
public void setDistrictCode(String districtCode) {
this.districtCode = districtCode;
}
@Column(name = "town_code")
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
@Column(name = "committee_code")
public String getCommitteeCode() {
return committeeCode;
}
public void setCommitteeCode(String committeeCode) {
this.committeeCode = committeeCode;
}
@Column(name = "type_code")
public String getTypeCode() {
return typeCode;
}
public void setTypeCode(String typeCode) {
this.typeCode = typeCode;
}
@Column(name = "type_name")
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
@Column(name = "verify_flag")
public String getVerifyFlag() {
return verifyFlag;
}
public void setVerifyFlag(String verifyFlag) {
this.verifyFlag = verifyFlag;
}
@Column(name = "addr_verify")
public String getAddrVerify() {
return addrVerify;
}
public void setAddrVerify(String addrVerify) {
this.addrVerify = addrVerify;
}
@Column(name = "county_level_city")
public String getCountyLevelCity() {
return countyLevelCity;
}
public void setCountyLevelCity(String countyLevelCity) {
this.countyLevelCity = countyLevelCity;
}
@Column(name = "administrative_town")
public String getAdministrativeTowns() {
return administrativeTowns;
}
public void setAdministrativeTowns(String administrativeTowns) {
this.administrativeTowns = administrativeTowns;
}
@Column(name = "county_gov")
public String getCountyGov() {
return countyGov;
}
public void setCountyGov(String countyGov) {
this.countyGov = countyGov;
}
@Column(name = "dev_district")
public String getDevDistrict() {
return devDistrict;
}
public void setDevDistrict(String devDistrict) {
this.devDistrict = devDistrict;
}
@Column(name = "dev_district_name")
public String getDevDistrictName() {
return devDistrictName;
}
public void setDevDistrictName(String devDistrictName) {
this.devDistrictName = devDistrictName;
}
@Column(name = "dev_level")
public String getDevLevel() {
return devLevel;
}
public void setDevLevel(String devLevel) {
this.devLevel = devLevel;
}
@Column(name = "lat")
public Double getLat() {
return lat;
}
public void setLat(Double lat) {
this.lat = lat;
}
@Column(name = "lng")
public Double getLng() {
return lng;
}
public void setLng(Double lng) {
this.lng = lng;
}
@Column(name = "addr_area")
public String getAddrArea() {
return addrArea;
}
public void setAddrArea(String addrArea) {
this.addrArea = addrArea;
}
@Column(name = "split_committee")
public String getSplitCommittee() {
return splitCommittee;
}
public void setSplitCommittee(String splitCommittee) {
this.splitCommittee = splitCommittee;
}
@Column(name = "split_street")
public String getSplitStreet() {
return splitStreet;
}
public void setSplitStreet(String splitStreet) {
this.splitStreet = splitStreet;
}
@Column(name = "poi_name")
public String getPoiName() {
return poiName;
}
public void setPoiName(String poiName) {
this.poiName = poiName;
}
@Column(name = "split_street_num")
public String getSplitStreetNum() {
return splitStreetNum;
}
public void setSplitStreetNum(String splitStreetNum) {
this.splitStreetNum = splitStreetNum;
}
@Column(name = "dev")
public String getDev() {
return dev;
}
public void setDev(String dev) {
this.dev = dev;
}
@Column(name = "community_source")
public String getCommunitySource() {
return communitySource;
}
public void setCommunitySource(String communitySource) {
this.communitySource = communitySource;
}
@Column(name = "match_poi_name")
public String getMatchPoiName() {
return matchPoiName;
}
public void setMatchPoiName(String matchPoiName) {
this.matchPoiName = matchPoiName;
}
@Column(name = "region_info")
public String getRegionInfo() {
return regionInfo;
}
public void setRegionInfo(String regionInfo) {
this.regionInfo = regionInfo;
}
@Column(name = "tjj_district_name")
public String getTjjDistrictName() {
return tjjDistrictName;
}
public void setTjjDistrictName(String tjjDistrictName) {
this.tjjDistrictName = tjjDistrictName;
}
@Column(name = "c_date")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
@Column(name = "_id")
public String getId() {
return id;
}
@Override
public void setId(String id) {
this.id = id;
}
@Column(name = "village_type")
public String getVillageType() {
return villageType;
}
public void setVillageType(String villageType) {
this.villageType = villageType;
}
@Column(name = "city_param")
public String getCityParam() {
return cityParam;
}
public void setCityParam(String cityParam) {
this.cityParam = cityParam;
}
}
@@ -0,0 +1,130 @@
package com.fangjia.dal.mongo.model.bkoff;
import com.fangjia.dal.MongoEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
@Entity
@Table(name = "business.building_ratio")
public class BuildingRatio implements MongoEntity {
private String id;
private String city;
private String region;
private String district;
private String building_name;
private String building_avg_price;
private String avg_price;
private Double ratio;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date c_date;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date m_date;
private String create_user;
private String note;
@Id
@GeneratedValue
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "city")
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
@Column(name = "region")
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "building_name")
public String getBuilding_name() {
return building_name;
}
public void setBuilding_name(String building_name) {
this.building_name = building_name;
}
@Column(name = "ratio")
public Double getRatio() {
return ratio;
}
public void setRatio(Double ratio) {
this.ratio = ratio;
}
@Column(name = "c_date")
public Date getC_date() {
return c_date;
}
public void setC_date(Date c_date) {
this.c_date = c_date;
}
@Column(name = "m_date")
public Date getM_date() {
return m_date;
}
public void setM_date(Date m_date) {
this.m_date = m_date;
}
@Column(name = "create_user")
public String getCreate_user() {
return create_user;
}
public void setCreate_user(String create_user) {
this.create_user = create_user;
}
@Column(name = "note")
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
@Column(name = "building_avg_price")
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;
}
@Column(name = "avg_price")
public String getAvg_price() {
return avg_price;
}
public void setAvg_price(String avg_price) {
this.avg_price = avg_price;
}
}
@@ -187,7 +187,7 @@ public class District implements SeaweedEntity {
private double score;
// 小区性质
private String landProperty;
private String masterDistrictNname;
private String masterDistrictName;
private String ip;
private String addrType;
private boolean selected;
@@ -309,12 +309,12 @@ public class District implements SeaweedEntity {
}
@Column(name = "master_district_name")
public String getMasterDistrictNname() {
return masterDistrictNname;
public String getMasterDistrictName() {
return masterDistrictName;
}
public void setMasterDistrictNname(String masterDistrictNname) {
this.masterDistrictNname = masterDistrictNname;
public void setMasterDistrictName(String masterDistrictName) {
this.masterDistrictName = masterDistrictName;
}
public void setCategory(String category) {
@@ -39,6 +39,8 @@ public class ApiUser implements SqlEntity {
private String manager;
private Integer isMonitor;
@Id
@Column(name = "ID")
public long getId() {
@@ -175,4 +177,12 @@ public class ApiUser implements SqlEntity {
public void setManager(String manager) {
this.manager = manager;
}
@Column(name = "IS_MONITOR")
public Integer getIsMonitor() {
return isMonitor;
}
public void setIsMonitor(Integer isMonitor) {
this.isMonitor = isMonitor;
}
}