diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index d9db99a40..5038125ae 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -270,6 +270,7 @@ public class ApiUserController { Long userId = model.getUserId(); Map dataApiUser = new HashMap(); dataApiUser.put("email", model.getEmail()); + dataApiUser.put("password", model.getPassword()); dataApiUser.put("siteName", model.getSiteName()); dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index 31fb2f51a..da2db31c2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -43,9 +43,13 @@ ${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!}) +<#-- --> +<#-- 密ç �--> +<#-- --> +<#-- --> - 密ç � - + 密ç � + 账户类型 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java new file mode 100644 index 000000000..7b38443f2 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java @@ -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 findcityByCode(String code); +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java new file mode 100644 index 000000000..a737f3157 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -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 implements AdministrativeDivisionDao { + @Override + public AdministrativeDivision findcityByCode(String code) { + if (StringUtils.isBlank(code)) { + return new AdministrativeDivision(); + } + List params = new ArrayList(); + params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); + params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "³ÇÊÐ")); + return (AdministrativeDivision) findFirstByParams(params); + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java new file mode 100644 index 000000000..abe9b0816 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java @@ -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; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 3fbd49d50..1106483b6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -1,24 +1,20 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; +import com.fangjia.dal.mongo.model.AdministrativeDivision; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.dal.mongo.model.DistrictFacilitys; import com.fangjia.dal.mongo.model.Evaluation; -import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.mongo.open.model.ApiUserAuthority; import com.fangjia.dal.mongo.open.model.EvaluateRatio; import com.fangjia.dal.seaweed.model.District; -import com.fangjia.open.HttpCode; -import com.fangjia.open.OpenHttpCodeEnum; import com.fangjia.open.dto.HouseValueInformationDto; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; import com.fangjia.open.interceptors.AuthenticationBean; -import com.fangjia.open.interceptors.Authority; -import com.fangjia.open.interceptors.Role; import com.fangjia.open.model.*; import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.open.util.CommonUtils; @@ -35,7 +31,6 @@ import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; -import com.fangjia.service.tool.OpenLogService; import com.fangjia.service.web.AddressService; import net.sf.json.JSONObject; import org.apache.commons.lang.ArrayUtils; @@ -54,7 +49,7 @@ import static com.poseidon.util.TypeConverter.convertToString; * @author 13607 * @since 2023/12/12 10:29 */ -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class ComprehensiveQueryController { private DistrictService districtService; @@ -84,6 +79,7 @@ public class ComprehensiveQueryController { static final int BAI_DU_GEO = 1;// °Ù¶ÈÏµ×ø±ê static final int GAO_DE_GEO = 2;// ¸ßµÂÏµ×ø±ê + private AdministrativeDivisionService administrativeDivisionService; private EvaluateRatioService evaluateRatioService; @@ -218,10 +214,21 @@ public class ComprehensiveQueryController { return mav; } + String cityStr = model.getCity(); + if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { + AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); + String city = administrativeDivision.getCityShort(); + if (StringUtils.isBlank(city)) { + mav.setModel(BasicModel.buildBadRequestModel("³ÇÊдúÂë´íÎó")); + return mav; + } + model.setCity(city); + } + HttpRequest httpRequest = new HttpRequest(); JSONObject json = null; Map communityAvgPriceParams = new HashMap(); -// communityAvgPriceParams.put("city", model.getCity()); + communityAvgPriceParams.put("city", model.getCity()); communityAvgPriceParams.put("address", model.getAddress()); communityAvgPriceParams.put("category", model.getCategory()); communityAvgPriceParams.put("useMap", String.valueOf(model.isUseMap())); @@ -232,7 +239,7 @@ public class ComprehensiveQueryController { } catch (HttpRequestException e) { } - if(matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { + if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { mav.setModel(BasicModel.buildBadRequestModel("¸ÃµØÖ·²»Ö§³Ö¹À¼Û£¡")); return mav; } @@ -287,7 +294,7 @@ public class ComprehensiveQueryController { // RestfulModelAndView houseCaseMav = new RestfulModelAndView(); List querys = null; try { - querys = convertSampileQueryToBean(district,sampleQuery); + querys = convertSampileQueryToBean(district, sampleQuery); } catch (Exception e) { mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); return mav; @@ -299,7 +306,7 @@ public class ComprehensiveQueryController { long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); - System.out.println("ÓÃʱ:"+(end-start)); + System.out.println("ÓÃʱ:" + (end - start)); Collateral collateral = collaterals.get(0); List samples = collateral.getSample(); UniversalDto houseCaseDto = UniversalDto.newDto(); @@ -426,7 +433,7 @@ public class ComprehensiveQueryController { return propertyModel; } - private List convertSampileQueryToBean(District district,SampleQuery... queries) throws Exception { + private List convertSampileQueryToBean(District district, SampleQuery... queries) throws Exception { List queryBeans = new ArrayList(queries.length); for (SampleQuery q : queries) { @@ -1230,8 +1237,6 @@ public class ComprehensiveQueryController { } - - public void setEvaluationService(EvaluationService evaluationService) { this.evaluationService = evaluationService; } @@ -1254,7 +1259,6 @@ public class ComprehensiveQueryController { } - public BatchEvaluateService getBatchEvaluateService() { return batchEvaluateService; } @@ -1313,5 +1317,8 @@ public class ComprehensiveQueryController { this.districtFacilitysService = districtFacilitysService; } + public void setAdministrativeDivisionService(AdministrativeDivisionService administrativeDivisionService) { + this.administrativeDivisionService = administrativeDivisionService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/test.java b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java new file mode 100644 index 000000000..3adf910da --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java @@ -0,0 +1,10 @@ +package com.fangjia.open; + +public class test { + public static void main(String[] args) { + String a = "123545"; + String b ="i980"; + System.out.println(a.matches("\\d+")); + System.out.println(b.matches("\\d+")); + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java new file mode 100644 index 000000000..76b415172 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java @@ -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); + +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java new file mode 100644 index 000000000..3bc896f0f --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java @@ -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; + } +}