diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/UserStatJob.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/UserStatJob.java index 4256483..c415be5 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/UserStatJob.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/UserStatJob.java @@ -2,6 +2,7 @@ package com.fangjia.job.fsh.job; import java.util.Date; import java.util.List; +import java.util.concurrent.Semaphore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,11 +77,16 @@ public class UserStatJob implements SimpleJob { final List LoanCustomersConfigList = loanCustomersConfigService.queryAll(); long total = enterpriseProductUserService.queryCount(); int pages = PageBean.calcPages(total, 1000); + final Semaphore semaphore = new Semaphore(10); for (int i = 1; i <= pages; i++) { List users = enterpriseProductUserService.queryByPage(i, 1000); for (EnterpriseProductUser user : users) { final EnterpriseProductUser u = user; if (u.getEid() %2 == Integer.parseInt(shardingContext.getShardingParameter())) { + try { + semaphore.acquire(); + } catch (InterruptedException e1) { + } FangjiaThreadPoolExecutor.execute(new Runnable() { @Override @@ -93,6 +99,8 @@ public class UserStatJob implements SimpleJob { } catch (Exception e) { logger.error("用户维度统计任务异常", e); DingDingMessageUtil.sendTextMessage("用户维度统计任务异常:" + e.getMessage()); + } finally { + semaphore.release(); } } }); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java index df0e9de..7ca014c 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java @@ -49,6 +49,19 @@ public class DistrictDetail { */ private DistrictBaseInfoDto districtBaseInfo; + /** + * 小区潜力指数 + */ + private Integer index; + + public Integer getIndex() { + return index; + } + + public void setIndex(Integer index) { + this.index = index; + } + public Date getModifyTime() { return modifyTime; } 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 5556ca9..41a132e 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 @@ -19,6 +19,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.JsonUtils; import com.fangjia.job.common.util.RestApiCallUtils; import com.fangjia.job.youfang.document.AgencyInfo; import com.fangjia.job.youfang.document.DistrictBaseInfoDto; @@ -90,6 +91,9 @@ public class DistrictInfoJob implements SimpleJob{ districtDetail.setName(name); districtDetail.setModifyTime(new Date()); DistrictEvaluateSingleDto dto = fshApiRemoteService.getDistrictNewPriceInfo(params); + if (dto != null && dto.getResult() != null && dto.getResult().getTagBo() != null) { + districtDetail.setIndex(dto.getResult().getTagBo().getIndex()); + } DistrictInfoDto districtInfoDto = fshApiRemoteService.detail(params); Map s = fshApiRemoteService.getAgencyInfo(params); params.put("size", 111.11); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsServiceImpl.java index f04098f..ed11bfa 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsServiceImpl.java @@ -10,13 +10,13 @@ public class NewsServiceImpl extends EntityService implements NewsService @Override public void pushNews(String date) { - String sql = "update news set `status`=1 where `status`=0 and deploy_time='"+date+"'"; + String sql = "update news set `status`=1 where `status`=0 and deploy_time<='"+date+"'"; super.getJdbcTemplate().execute(sql); } @Override public void offlineNews(String date) { - String sql = "update news set `status`=2 where `status`=1 and offline_time='"+date+"'"; + String sql = "update news set `status`=2 where `status`=1 and offline_time<='"+date+"'"; super.getJdbcTemplate().execute(sql); }