diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java index ae31c98dc..5d2ee9181 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java @@ -6,6 +6,7 @@ import java.util.List; public class SeawaterQuery { private String id; + private List ids; private String cat; private String region; private String districtName; @@ -287,4 +288,12 @@ public class SeawaterQuery { public void setTags(List tags) { this.tags = tags; } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java index 91ccf87fc..8bea1a0c3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java @@ -150,6 +150,10 @@ public class Evaluation implements MongoEntity { * 查询范围 */ private Integer radius; + /** + * 样本IDS + */ + private String sampleIds; /** * 商铺标签 */ @@ -1092,4 +1096,13 @@ public class Evaluation implements MongoEntity { public void setTags(String tags) { this.tags = tags; } + + @Column(name = "sample_ids") + public String getSampleIds() { + return sampleIds; + } + + public void setSampleIds(String sampleIds) { + this.sampleIds = sampleIds; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 8bd2ff7be..2c49399a8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -642,6 +642,13 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i temp.put("term", param); jsonList.add(temp); } + if(query.getIds() != null){ + JSONObject param = new JSONObject(); + param.put("_id", query.getIds()); + JSONObject temp = new JSONObject(); + temp.put("terms", param); + jsonList.add(temp); + } if (StringUtils.isNotBlank(query.getCat())) { JSONObject param = new JSONObject(); param.put("cat", query.getCat()); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/SeawaterDto.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/SeawaterDto.java index 736f8cdc4..0f4ecccf3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/SeawaterDto.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/SeawaterDto.java @@ -2,6 +2,7 @@ package com.fangjia.dal.seawater.model; public class SeawaterDto { + private String id; private String city; private String district; private String name; @@ -143,4 +144,12 @@ public class SeawaterDto { public void setLocation(String location) { this.location = location; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java index b47a09194..de61004a9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopController.java @@ -463,6 +463,7 @@ public class ShopController { evaluation.setCreationDate(new Date()); evaluation.setModificationDate(new Date()); evaluation.setClientNo(model.getClientNo()); + evaluation.setSampleIds(model.getSampleIds()); if (0 != model.getAge()) { evaluation.setAge(model.getAge()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java index 085f24b0c..8807fda05 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ShopSellController.java @@ -445,7 +445,7 @@ public class ShopSellController { evaluation.setLevel(model.getLevel()); evaluation.setFitment(model.getFitment()); evaluation.setType(model.getType()); - + evaluation.setSampleIds(model.getSampleIds()); evaluation.setCity(model.getCity()); evaluation.setRegion(model.getRegion()); evaluation.setDistrictName(model.getName()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java index c7e564225..0d134164c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/PropertyEvaluationModel.java @@ -294,6 +294,8 @@ public class PropertyEvaluationModel extends FangjiaApiModel { private String tags; + private String sampleIds; + public void setDecorationAge(int decorationAge) { this.decorationAge = decorationAge; } @@ -952,4 +954,12 @@ public class PropertyEvaluationModel extends FangjiaApiModel { public void setTags(String tags) { this.tags = tags; } + + public void setSampleIds(String sampleIds) { + this.sampleIds = sampleIds; + } + + public String getSampleIds() { + return sampleIds; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/AiShopServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/AiShopServiceImpl.java index 5fd208ab3..e3791f932 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/AiShopServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/AiShopServiceImpl.java @@ -208,6 +208,7 @@ public class AiShopServiceImpl implements AiShopService { private static SeawaterDto getSeawaterDto(Seawater seawater, String cat) { SeawaterDto seawaterDto = new SeawaterDto(); seawaterDto.setCity(seawater.getCity()); + seawaterDto.setId(seawater.getId()); seawaterDto.setDistrict(seawater.getRegion()); seawaterDto.setName(seawater.getName()); seawaterDto.setArea(seawater.getArea()); @@ -332,6 +333,9 @@ public class AiShopServiceImpl implements AiShopService { if (StringUtils.isNotBlank(evaluation.getTags())) { query.setTags(Arrays.asList(evaluation.getTags().split(","))); } + if(StringUtils.isNotBlank(evaluation.getSampleIds())){ + query.setIds(Arrays.asList(evaluation.getSampleIds().split(","))); + } // 查询近一年样本 query.setStartDate(Integer.parseInt(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd"))); query.setEndDate(Integer.parseInt(DateUtil.formatByPattern(new Date(), "yyyyMMdd"))); @@ -395,6 +399,9 @@ public class AiShopServiceImpl implements AiShopService { if (StringUtils.isNotBlank(evaluation.getTags())) { query.setTags(Arrays.asList(evaluation.getTags().split(","))); } + if(StringUtils.isNotBlank(evaluation.getSampleIds())){ + query.setIds(Arrays.asList(evaluation.getSampleIds().split(","))); + } // 查询近一年样本 query.setStartDate(Integer.parseInt(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd"))); query.setEndDate(Integer.parseInt(DateUtil.formatByPattern(new Date(), "yyyyMMdd"))); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/util/GeoUtils.java b/projects/fangjia-service/src/main/java/com/fangjia/service/util/GeoUtils.java index 85d968763..2c3b1119a 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/util/GeoUtils.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/util/GeoUtils.java @@ -24,7 +24,7 @@ public class GeoUtils { GaodeDto gaodeDto = new GaodeDto(); Map params = new HashMap(); params.put("address", address); - params.put("key", "0cb105e7c10e9ae2b178e4744d62319a"); + params.put("key", "a34894d151fffff94f9a33bae3d5565c"); params.put("city", city); params.put("batch", "true"); params.put("output", "json");