diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java index c0832a5..32fcd16 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java @@ -7,7 +7,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -15,6 +18,7 @@ import org.springframework.data.mongodb.core.query.Query; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.common.util.DingDingMessageUtil; import com.fangjia.job.common.util.RestApiCallUtils; import com.fangjia.job.youfang.document.AgencyInfo; import com.fangjia.job.youfang.document.DistrictBaseInfoDto; @@ -34,6 +38,8 @@ import com.mongodb.Mongo; public class DistrictInfoJob implements SimpleJob{ + private Logger logger = LoggerFactory.getLogger(EnterpriseStatJob.class); + @Value("${FANGJIA_API_TOKEN}") private String token; @@ -43,6 +49,10 @@ public class DistrictInfoJob implements SimpleJob{ @Autowired private MongoTemplate mongoTemplate; + @Autowired + @Qualifier("seaweedMongoTemplate") + private MongoTemplate seaweedMongoTemplate; + private ExecutorService fixPool = Executors.newFixedThreadPool(5); @Override @@ -50,9 +60,7 @@ public class DistrictInfoJob implements SimpleJob{ System.out.println("start :"+new Date()); final FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, openApiUrl); //params.put("type", 4); - - Mongo mongo = mongoTemplate.getDb().getMongo(); - DBCollection collection = mongo.getDB("fangjia").getCollection("seaweed"); + DBCollection collection = seaweedMongoTemplate.getCollection("seaweed"); DBCursor cursor = collection.find(new BasicDBObject("cat", "district").append("status", 0).append("city", "上海"), new BasicDBObject("city", 1).append("region", 1).append("name", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT); final Semaphore semaphore = new Semaphore(5); @@ -86,7 +94,7 @@ public class DistrictInfoJob implements SimpleJob{ DistrictEvaluateSingleDto dto = fshApiRemoteService.getDistrictNewPriceInfo(params); DistrictInfoDto districtInfoDto = fshApiRemoteService.detail(params); Map s = fshApiRemoteService.getAgencyInfo(params); - params.put("size", 50); + params.put("size", 111.11); params.put("propertyType", 2); DistrictSearchSingleDto dssDto = fshApiRemoteService.evaluate(params); @@ -111,20 +119,22 @@ public class DistrictInfoJob implements SimpleJob{ } DistrictBaseInfoDto dbiDto = districtInfoDto==null?null:districtInfoDto.getResult(); if(dbiDto!=null&&null!=dssDto&&dssDto.getResult()!=null) { - DistrictDto add = dssDto.getResult(); + DistrictDto add = dssDto.getResult();// FROM evaluate DistrictDto original = dbiDto.getDistrict(); original.setUpDownRangecityLevel(add.getUpDownRangecityLevel()); original.setAvgPrice(add.getAvgPrice()); original.setCityDistrictMaxSellPrice(add.getCityDistrictMaxSellPrice()); original.setCityDistrictMinSellPrice(add.getCityDistrictMinSellPrice()); original.setPriceRate(add.getPriceRate()); + original.setTotalScore(add.getTotalScore()); } districtDetail.setAgencyInfo(a); districtDetail.setDistrictBaseInfo(null!=districtInfoDto?districtInfoDto.getResult():null); districtDetail.setDistrictNewPriceInfo(deDto); mongoTemplate.save(districtDetail); }catch(Exception e) { - e.printStackTrace(); + logger.error("有房小区详情数据汇总异常", e); + DingDingMessageUtil.sendTextMessage("有房小区详情数据汇总异常:" + e.getMessage()); }finally { semaphore.release(); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml b/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml index 132a603..136ffcd 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml +++ b/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml @@ -95,7 +95,7 @@