Merge branch 'FSHJOB1.2' into 'master'

Fshjob1.2

See merge request !31
This commit is contained in:
虞继恩
2018-06-11 14:39:13 +08:00
2 changed files with 6 additions and 6 deletions
@@ -21,7 +21,7 @@ public class SpringEsConfig {
@Bean
public TransportClient transportClient() {
Settings settings = Settings.builder().put("cluster.name", "fangjia")
.put("client.transport.ping_timeout", "60s").put("client.transport.sniff", true).build();
.put("client.transport.ping_timeout", "60s").build();
try {
return new PreBuiltTransportClient(settings)
.addTransportAddress(new TransportAddress(InetAddress.getByName(url), 9300));
@@ -89,10 +89,10 @@ public class DistrictInfoJob implements SimpleJob{
} else {
id = districtDetail.getId();
}
DistrictDetailDto dto = fshApiRemoteService.districtDetail(params);
if (dto != null && dto.getResult() != null) {
BeanUtils.copyProperties(dto.getResult(), districtDetail);
}
//DistrictDetailDto dto = fshApiRemoteService.districtDetail(params);
//if (dto != null && dto.getResult() != null) {
//BeanUtils.copyProperties(dto.getResult(), districtDetail);
//}
if (id != null) {
districtDetail.setId(id);
}
@@ -108,7 +108,7 @@ public class DistrictInfoJob implements SimpleJob{
districtDetail.setName(name);
districtDetail.setEstateType(estateType);
districtDetail.setModifyTime(new Date());
mongoTemplate.save(districtDetail);
//mongoTemplate.save(districtDetail);
initDataToEs(districtDetail);
}catch(Exception e) {
logger.error("有房小区详情数据汇总异常", e);