From 667c8305c2a1cbc49cc5a2eea1e176cd93333fa1 Mon Sep 17 00:00:00 2001 From: bayi Date: Thu, 17 May 2018 16:45:46 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangjia-job/fangjia-job-youfang/pom.xml | 5 ++++ .../job/youfang/job/CityRankingSendJob.java | 22 +++++++++++++++ .../youfang/job/HousingEstateNewsSendJob.java | 22 +++++++++++++++ .../job/youfang/job/TopNewsSendJob.java | 22 +++++++++++++++ .../src/main/resources/applicationContext.xml | 28 +++++++++++++++++++ fangjia-job/pom.xml | 6 ++++ 6 files changed, 105 insertions(+) create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java diff --git a/fangjia-job/fangjia-job-youfang/pom.xml b/fangjia-job/fangjia-job-youfang/pom.xml index e58901d..d25c2c9 100644 --- a/fangjia-job/fangjia-job-youfang/pom.xml +++ b/fangjia-job/fangjia-job-youfang/pom.xml @@ -71,6 +71,11 @@ com.cxytiandi cxytiandi-jdbc + + + org.projectlombok + lombok + diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java new file mode 100644 index 0000000..0ebc283 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -0,0 +1,22 @@ +package com.fangjia.job.youfang.job; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.dangdang.ddframe.job.api.ShardingContext; +import com.dangdang.ddframe.job.api.simple.SimpleJob; + +public class CityRankingSendJob implements SimpleJob { + + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); + + @Override + public void execute(ShardingContext context) { + LOG.info("城市排名推送开始,context:"+context); + //1.查询 + //2.对比 + //3.发送 + //4.记录 + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java new file mode 100644 index 0000000..7e1640f --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -0,0 +1,22 @@ +package com.fangjia.job.youfang.job; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.dangdang.ddframe.job.api.ShardingContext; +import com.dangdang.ddframe.job.api.simple.SimpleJob; + +public class HousingEstateNewsSendJob implements SimpleJob { + + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); + + @Override + public void execute(ShardingContext context) { + LOG.info("城市小区推送开始,context:"+context); + //1.查询 + //2.对比 + //3.发送 + //4.记录 + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java new file mode 100644 index 0000000..f0fa6fa --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -0,0 +1,22 @@ +package com.fangjia.job.youfang.job; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.dangdang.ddframe.job.api.ShardingContext; +import com.dangdang.ddframe.job.api.simple.SimpleJob; + +public class TopNewsSendJob implements SimpleJob { + + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); + + @Override + public void execute(ShardingContext context) { + LOG.info("城市置顶咨询推送开始,context:"+context); + //1.查询 + //2.对比 + //3.发送 + //4.记录 + } + +} 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 d80c5a7..e61f113 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml +++ b/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml @@ -141,6 +141,34 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangjia-job/pom.xml b/fangjia-job/pom.xml index 0888b67..9618749 100644 --- a/fangjia-job/pom.xml +++ b/fangjia-job/pom.xml @@ -81,6 +81,12 @@ feign-core ${feign.version} + + + org.projectlombok + lombok + 1.16.20 + From 146b824d9e1a585aa7477d23061a904f50453fee Mon Sep 17 00:00:00 2001 From: bayi Date: Thu, 17 May 2018 17:15:44 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/po/CityCollect.java | 25 ++++++++ .../fangjia/job/youfang/po/PushMessage.java | 57 +++++++++++++++++++ .../job/youfang/po/PushRecordMessage.java | 30 ++++++++++ 3 files changed, 112 insertions(+) create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java new file mode 100644 index 0000000..b909bb2 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java @@ -0,0 +1,25 @@ +package com.fangjia.job.youfang.po; + +import com.cxytiandi.jdbc.annotation.AutoId; +import com.cxytiandi.jdbc.annotation.Field; +import com.cxytiandi.jdbc.annotation.TableName; + +import lombok.Data; + +@Data +@TableName(value = "city_collect", author = "yinjihuan", desc = "城市收藏表") +public class CityCollect { + + @AutoId + @Field(value = "id", desc = "ID") + private long id; + + @Field(value = "city", desc = "城市") + private String city; + + @Field(value = "add_time", desc = "保存时间") + private Data addTime; + + @Field(value = "uid", desc = "用户ID") + private long uid; +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java new file mode 100644 index 0000000..7f80c41 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java @@ -0,0 +1,57 @@ +package com.fangjia.job.youfang.po; + +import java.util.Date; + +import com.cxytiandi.jdbc.annotation.AutoId; +import com.cxytiandi.jdbc.annotation.Field; +import com.cxytiandi.jdbc.annotation.TableName; + +import lombok.Data; + +@Data +@TableName(value = "push_message", author = "yinjihuan", desc = "推送消息表") +public class PushMessage { + + @AutoId + @Field(value = "id", desc = "ID") + private long id; + + @Field(value = "title", desc = "标题") + private String title; + + @Field(value = "content", desc = "内容") + private String content; + + @Field(value = "add_time", desc = "添加时间") + private Date addTime; + + @Field(value = "save_status", desc = "用户消息列表是否留存(0不存,1存)") + private int saveStatus; + + @Field(value = "operation", desc = "通知操作(0:打开应用,1:打开指定页面,2:打开url)") + private int operation; + + @Field(value = "operation_page", desc = "当通知操作为打开具体页面时这个值就是页面的值,当为打开url时这个值就是url的值") + private String operationPage; + + @Field(value = "user_range", desc = "通知用户范围(0:全部用户,1:部分用户)") + private int userRange; + + @Field(value = "user_range_city", desc = "通知用户范围对应的城市") + private String userRangeCity; + + @Field(value = "push_time", desc = "推送时间") + private Date pushTime; + + @Field(value = "push_status", desc = "是否已推送(0未推送,1已推送)") + private int pushStatus; + + @Field(value = "user_range_province", desc = "通知用户所在省份") + private String userRangeProvince; + + @Field(value = "uid", desc = "创建用户ID") + private long uid; + + @Field(value = "user_range_city_code", desc = "个推城市码") + private String userRangeCityCode; +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java new file mode 100644 index 0000000..be9fbdc --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java @@ -0,0 +1,30 @@ +package com.fangjia.job.youfang.po; + +import java.util.Date; + +import com.cxytiandi.jdbc.annotation.AutoId; +import com.cxytiandi.jdbc.annotation.Field; +import com.cxytiandi.jdbc.annotation.TableName; + +import lombok.Data; + +@Data +@TableName(value = "push_record_message", author = "yinjihuan", desc = "推送消息记录表") +public class PushRecordMessage { + + @AutoId + @Field(value = "id", desc = "ID") + private long id; + + @Field(value = "uid", desc = "用户ID") + private long uid; + + @Field(value = "mid", desc = "消息ID") + private long mid; + + @Field(value = "add_time", desc = "添加时间") + private Date addTime; + + @Field(value = "read_status", desc = "是否已读 (0未读,1已读)") + private int readStatus; +} From d2d84e3eb5c087ba2ab4a0d9e91b65eb1cc999f1 Mon Sep 17 00:00:00 2001 From: bayi Date: Thu, 17 May 2018 17:39:43 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/po/CityCollect.java | 6 ++++- .../fangjia/job/youfang/po/PushMessage.java | 5 +++- .../job/youfang/po/PushRecordMessage.java | 5 +++- .../youfang/service/CityCollectService.java | 11 +++++++++ .../service/CityCollectServiceImpl.java | 20 ++++++++++++++++ .../youfang/service/PushMessageService.java | 8 +++++++ .../service/PushMessageServiceImpl.java | 17 +++++++++++++ .../service/PushRecordMessageService.java | 10 ++++++++ .../service/PushRecordMessageServiceImpl.java | 24 +++++++++++++++++++ 9 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectService.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java index b909bb2..bf47008 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java @@ -1,5 +1,7 @@ package com.fangjia.job.youfang.po; +import java.io.Serializable; + import com.cxytiandi.jdbc.annotation.AutoId; import com.cxytiandi.jdbc.annotation.Field; import com.cxytiandi.jdbc.annotation.TableName; @@ -8,7 +10,9 @@ import lombok.Data; @Data @TableName(value = "city_collect", author = "yinjihuan", desc = "城市收藏表") -public class CityCollect { +public class CityCollect implements Serializable { + + private static final long serialVersionUID = 5064195667364691855L; @AutoId @Field(value = "id", desc = "ID") diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java index 7f80c41..de1caf2 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java @@ -1,5 +1,6 @@ package com.fangjia.job.youfang.po; +import java.io.Serializable; import java.util.Date; import com.cxytiandi.jdbc.annotation.AutoId; @@ -10,7 +11,9 @@ import lombok.Data; @Data @TableName(value = "push_message", author = "yinjihuan", desc = "推送消息表") -public class PushMessage { +public class PushMessage implements Serializable { + + private static final long serialVersionUID = -1101101524583976384L; @AutoId @Field(value = "id", desc = "ID") diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java index be9fbdc..d85a15e 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java @@ -1,5 +1,6 @@ package com.fangjia.job.youfang.po; +import java.io.Serializable; import java.util.Date; import com.cxytiandi.jdbc.annotation.AutoId; @@ -10,7 +11,9 @@ import lombok.Data; @Data @TableName(value = "push_record_message", author = "yinjihuan", desc = "推送消息记录表") -public class PushRecordMessage { +public class PushRecordMessage implements Serializable { + + private static final long serialVersionUID = 6736005034016737661L; @AutoId @Field(value = "id", desc = "ID") diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectService.java new file mode 100644 index 0000000..cbf1931 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectService.java @@ -0,0 +1,11 @@ +package com.fangjia.job.youfang.service; + +import java.util.List; + +import com.fangjia.job.youfang.po.CityCollect; + +public interface CityCollectService { + + List findAll(); + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java new file mode 100644 index 0000000..eea5803 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java @@ -0,0 +1,20 @@ +package com.fangjia.job.youfang.service; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.cxytiandi.jdbc.EntityService; +import com.fangjia.job.youfang.po.AdVisitLog; +import com.fangjia.job.youfang.po.CityCollect; + +@Service +public class CityCollectServiceImpl extends EntityService implements CityCollectService { + + @Override + public List findAll() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java new file mode 100644 index 0000000..81c2c76 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java @@ -0,0 +1,8 @@ +package com.fangjia.job.youfang.service; + +import com.fangjia.job.youfang.po.PushMessage; + +public interface PushMessageService { + + void insert(PushMessage message); +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java new file mode 100644 index 0000000..79d6b3f --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java @@ -0,0 +1,17 @@ +package com.fangjia.job.youfang.service; + +import org.springframework.stereotype.Service; + +import com.cxytiandi.jdbc.EntityService; +import com.fangjia.job.youfang.po.PushMessage; + +@Service +public class PushMessageServiceImpl extends EntityService implements PushMessageService { + + @Override + public void insert(PushMessage message) { + // TODO Auto-generated method stub + + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java new file mode 100644 index 0000000..223c9e9 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java @@ -0,0 +1,10 @@ +package com.fangjia.job.youfang.service; + +import com.fangjia.job.youfang.po.PushRecordMessage; + +public interface PushRecordMessageService { + + PushRecordMessage findByUidAndMid(long uid,long mid); + + void insert(PushRecordMessage message); +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java new file mode 100644 index 0000000..584ac32 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java @@ -0,0 +1,24 @@ +package com.fangjia.job.youfang.service; + +import org.springframework.stereotype.Service; + +import com.cxytiandi.jdbc.EntityService; +import com.fangjia.job.youfang.po.AdVisitLog; +import com.fangjia.job.youfang.po.PushRecordMessage; + +@Service +public class PushRecordMessageServiceImpl extends EntityService implements PushRecordMessageService { + + @Override + public PushRecordMessage findByUidAndMid(long uid, long mid) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void insert(PushRecordMessage message) { + // TODO Auto-generated method stub + + } + +} From dad5cc666eb6871ab1fae29a6c628077fa661cdf Mon Sep 17 00:00:00 2001 From: bayi Date: Fri, 18 May 2018 11:37:37 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/youfang/document/CitySendLog.java | 29 ++++ .../job/youfang/job/CityRankingSendJob.java | 12 ++ .../youfang/job/HousingEstateNewsSendJob.java | 17 +- .../job/youfang/job/TopNewsSendJob.java | 15 ++ .../fangjia/job/youfang/po/CityCollect.java | 4 +- .../java/com/fangjia/job/youfang/po/News.java | 162 +++++++++++++++++- .../fangjia/job/youfang/po/PushMessage.java | 12 +- .../job/youfang/po/PushRecordMessage.java | 8 +- .../service/CityCollectServiceImpl.java | 10 +- .../youfang/service/CitySendLogService.java | 12 ++ .../service/CitySendLogServiceImpl.java | 48 ++++++ .../job/youfang/service/NewsService.java | 13 +- .../job/youfang/service/NewsServiceImpl.java | 26 ++- .../youfang/service/PushMessageService.java | 5 +- .../service/PushMessageServiceImpl.java | 6 - .../service/PushRecordMessageService.java | 5 - .../service/PushRecordMessageServiceImpl.java | 13 -- 17 files changed, 339 insertions(+), 58 deletions(-) create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java new file mode 100644 index 0000000..8bf25be --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java @@ -0,0 +1,29 @@ +package com.fangjia.job.youfang.document; + +import java.util.Date; + +import lombok.Data; + +/** + * 城市相关推送记录 + * + * @author user + * + */ +@Data +public class CitySendLog { + + private String city; + + private long uid; + + private long newsId; + + private Date sendTime; + + /* + * 0.置顶咨询推送,1.小区推送 2.涨幅排行推送 3.跌幅排行推送 4.潜力排行推送 + */ + private byte sendType; + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 0ebc283..0ba027b 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -2,13 +2,25 @@ package com.fangjia.job.youfang.job; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.youfang.service.CityCollectService; +import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.PushMessageService; +import com.fangjia.job.youfang.service.PushRecordMessageService; public class CityRankingSendJob implements SimpleJob { private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); + + @Autowired + private CityCollectService cityCollectService; + + @Autowired + private CitySendLogService citySendLogService; + @Override public void execute(ShardingContext context) { diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 7e1640f..c126c8d 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -2,14 +2,29 @@ package com.fangjia.job.youfang.job; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.youfang.service.CityCollectService; +import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.NewsService; +import com.fangjia.job.youfang.service.PushMessageService; +import com.fangjia.job.youfang.service.PushRecordMessageService; public class HousingEstateNewsSendJob implements SimpleJob { private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); - + + @Autowired + private CityCollectService cityCollectService; + + @Autowired + private CitySendLogService citySendLogService; + + @Autowired + private NewsService newsService; + @Override public void execute(ShardingContext context) { LOG.info("城市小区推送开始,context:"+context); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index f0fa6fa..43bea83 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -2,13 +2,28 @@ package com.fangjia.job.youfang.job; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.youfang.service.CityCollectService; +import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.NewsService; +import com.fangjia.job.youfang.service.PushMessageService; +import com.fangjia.job.youfang.service.PushRecordMessageService; public class TopNewsSendJob implements SimpleJob { private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); + + @Autowired + private CityCollectService cityCollectService; + + @Autowired + private CitySendLogService citySendLogService; + + @Autowired + private NewsService newsService; @Override public void execute(ShardingContext context) { diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java index bf47008..41289bb 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/CityCollect.java @@ -16,7 +16,7 @@ public class CityCollect implements Serializable { @AutoId @Field(value = "id", desc = "ID") - private long id; + private Long id; @Field(value = "city", desc = "城市") private String city; @@ -25,5 +25,5 @@ public class CityCollect implements Serializable { private Data addTime; @Field(value = "uid", desc = "用户ID") - private long uid; + private Long uid; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java index bd11c35..ac60070 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java @@ -50,8 +50,8 @@ public class News implements Serializable { @Field(value = "content", desc = "内容") private String content; - @Field(value = "publish_status", desc = "是否已发布(0:未发布,1已发布)") - private int publishStatus; + // @Field(value = "publish_status", desc = "是否已发布(0:未发布,1已发布)") + // private int publishStatus; @Field(value = "top_status", desc = "是否置顶(0否 1是)") private int topStatus; @@ -62,6 +62,9 @@ public class News implements Serializable { @Field(value = "visit_count", desc = "浏览量") private int visitCount; + @Field(value = "thumbs_up_count", desc = "点赞量") + private int thumbsUpCount; + @Field(value = "vote_favor_count", desc = "投票赞成数量") private int voteFavorCount; @@ -71,6 +74,42 @@ public class News implements Serializable { @Field(value = "user_id", desc = "创建用户ID") private Long userId; + @Field(value = "m_date", desc = "修改时间") + private Date mDate; + + @Field(value = "tags", desc = "标签,多个下划线分割") + private String tags; + + @Field(value = "vote_favor_text", desc = "投票赞成显示文字(投票类专有)") + private String voteFavorText; + + @Field(value = "vote_no_favor_text", desc = "投票不赞成显示文字(投票类专有)") + private String voteNoFavorText; + + @Field(value = "recommend_city", desc = "推荐城市,城市推荐才有此值") + private String recommendCity; + + @Field(value = "recommend_city_tags", desc = "推荐城市的标签,下划线分割,城市推荐才有此值") + private String recommendCityTags; + + @Field(value = "recommend_district_city", desc = "小区推荐咨询的城市") + private String recommendDistrictCity; + + @Field(value = "recommend_district_region", desc = "小区推荐咨询的区域") + private String recommendDistrictRegion; + + @Field(value = "recommend_district_name", desc = "小区推荐咨询的小区名") + private String recommendDistrictName; + + @Field(value = "recommend_district_tags", desc = "小区推荐咨询的小区标签,下划线分割") + private String recommendDistrictTags; + + @Field(value = "small_cover_img", desc = "封面缩略图") + private String smallCoverImg; + + @Field(value = "init_visit_count", desc = "初始化浏览量") + private Integer initVisitCount; + public Long getId() { return id; } @@ -175,13 +214,13 @@ public class News implements Serializable { this.content = content; } - public int getPublishStatus() { - return publishStatus; - } - - public void setPublishStatus(int publishStatus) { - this.publishStatus = publishStatus; - } + // public int getPublishStatus() { + // return publishStatus; + // } + // + // public void setPublishStatus(int publishStatus) { + // this.publishStatus = publishStatus; + // } public int getTopStatus() { return topStatus; @@ -230,4 +269,109 @@ public class News implements Serializable { public void setUserId(Long userId) { this.userId = userId; } + + public int getThumbsUpCount() { + return thumbsUpCount; + } + + public void setThumbsUpCount(int thumbsUpCount) { + this.thumbsUpCount = thumbsUpCount; + } + + public Date getmDate() { + return mDate; + } + + public void setmDate(Date mDate) { + this.mDate = mDate; + } + + public String getTags() { + return tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + + public String getVoteFavorText() { + return voteFavorText; + } + + public void setVoteFavorText(String voteFavorText) { + this.voteFavorText = voteFavorText; + } + + public String getVoteNoFavorText() { + return voteNoFavorText; + } + + public void setVoteNoFavorText(String voteNoFavorText) { + this.voteNoFavorText = voteNoFavorText; + } + + public String getRecommendCity() { + return recommendCity; + } + + public void setRecommendCity(String recommendCity) { + this.recommendCity = recommendCity; + } + + public String getRecommendCityTags() { + return recommendCityTags; + } + + public void setRecommendCityTags(String recommendCityTags) { + this.recommendCityTags = recommendCityTags; + } + + public String getRecommendDistrictCity() { + return recommendDistrictCity; + } + + public void setRecommendDistrictCity(String recommendDistrictCity) { + this.recommendDistrictCity = recommendDistrictCity; + } + + public String getRecommendDistrictRegion() { + return recommendDistrictRegion; + } + + public void setRecommendDistrictRegion(String recommendDistrictRegion) { + this.recommendDistrictRegion = recommendDistrictRegion; + } + + public String getRecommendDistrictName() { + return recommendDistrictName; + } + + public void setRecommendDistrictName(String recommendDistrictName) { + this.recommendDistrictName = recommendDistrictName; + } + + public String getRecommendDistrictTags() { + return recommendDistrictTags; + } + + public void setRecommendDistrictTags(String recommendDistrictTags) { + this.recommendDistrictTags = recommendDistrictTags; + } + + public String getSmallCoverImg() { + return smallCoverImg; + } + + public void setSmallCoverImg(String smallCoverImg) { + this.smallCoverImg = smallCoverImg; + } + + public Integer getInitVisitCount() { + return initVisitCount; + } + + public void setInitVisitCount(Integer initVisitCount) { + this.initVisitCount = initVisitCount; + } + } \ No newline at end of file diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java index de1caf2..f93388e 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushMessage.java @@ -17,7 +17,7 @@ public class PushMessage implements Serializable { @AutoId @Field(value = "id", desc = "ID") - private long id; + private Long id; @Field(value = "title", desc = "标题") private String title; @@ -29,16 +29,16 @@ public class PushMessage implements Serializable { private Date addTime; @Field(value = "save_status", desc = "用户消息列表是否留存(0不存,1存)") - private int saveStatus; + private Integer saveStatus; @Field(value = "operation", desc = "通知操作(0:打开应用,1:打开指定页面,2:打开url)") - private int operation; + private Integer operation; @Field(value = "operation_page", desc = "当通知操作为打开具体页面时这个值就是页面的值,当为打开url时这个值就是url的值") private String operationPage; @Field(value = "user_range", desc = "通知用户范围(0:全部用户,1:部分用户)") - private int userRange; + private Integer userRange; @Field(value = "user_range_city", desc = "通知用户范围对应的城市") private String userRangeCity; @@ -47,13 +47,13 @@ public class PushMessage implements Serializable { private Date pushTime; @Field(value = "push_status", desc = "是否已推送(0未推送,1已推送)") - private int pushStatus; + private Integer pushStatus; @Field(value = "user_range_province", desc = "通知用户所在省份") private String userRangeProvince; @Field(value = "uid", desc = "创建用户ID") - private long uid; + private Long uid; @Field(value = "user_range_city_code", desc = "个推城市码") private String userRangeCityCode; diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java index d85a15e..056f0b3 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/PushRecordMessage.java @@ -17,17 +17,17 @@ public class PushRecordMessage implements Serializable { @AutoId @Field(value = "id", desc = "ID") - private long id; + private Long id; @Field(value = "uid", desc = "用户ID") - private long uid; + private Long uid; @Field(value = "mid", desc = "消息ID") - private long mid; + private Long mid; @Field(value = "add_time", desc = "添加时间") private Date addTime; @Field(value = "read_status", desc = "是否已读 (0未读,1已读)") - private int readStatus; + private Integer readStatus; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java index eea5803..fdf8348 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java @@ -5,16 +5,18 @@ import java.util.List; import org.springframework.stereotype.Service; import com.cxytiandi.jdbc.EntityService; -import com.fangjia.job.youfang.po.AdVisitLog; +import com.cxytiandi.jdbc.Orders; +import com.cxytiandi.jdbc.Orders.OrderyType; import com.fangjia.job.youfang.po.CityCollect; @Service -public class CityCollectServiceImpl extends EntityService implements CityCollectService { +public class CityCollectServiceImpl extends EntityService implements CityCollectService { + + private static final String ORDER_PARAM = "city"; @Override public List findAll() { - // TODO Auto-generated method stub - return null; + return super.list(new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java new file mode 100644 index 0000000..bc88256 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java @@ -0,0 +1,12 @@ +package com.fangjia.job.youfang.service; + +import java.util.List; + +import com.fangjia.job.youfang.document.CitySendLog; + +public interface CitySendLogService { + + void save(CitySendLog log); + + List find(long uid, Long newsId, Byte sendType); +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java new file mode 100644 index 0000000..7d00b6c --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java @@ -0,0 +1,48 @@ +package com.fangjia.job.youfang.service; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Service; + +import com.fangjia.job.youfang.document.CitySendLog; + +@Service +public class CitySendLogServiceImpl implements CitySendLogService { + + @Autowired + private MongoTemplate mongoTemplate; + + @Override + public void save(CitySendLog log) { + mongoTemplate.save(log); + } + + @Override + public List find(long uid, Long newsId, Byte sendType) { + if (null != newsId) {// 咨询推送 + Query query = Query.query(Criteria.where("uid").is(uid).and("newsId").is(newsId)); + return mongoTemplate.find(query, CitySendLog.class); + } else { // 排名推送,查当前一个月内的记录 + Query query = Query.query( + Criteria.where("uid").is(uid).and("sendTime").gt(getMonthAgo()).and("sendType").is(sendType)); + return mongoTemplate.find(query, CitySendLog.class); + } + } + + /** + * 取一个月前的时间 + * + * @return + */ + private Date getMonthAgo() { + Calendar c = Calendar.getInstance(); + c.setTime(new Date()); + c.add(Calendar.MONTH, -1); + return c.getTime(); + } +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsService.java index 150a56c..2258498 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/NewsService.java @@ -1,19 +1,28 @@ package com.fangjia.job.youfang.service; +import java.util.List; + +import com.fangjia.job.youfang.po.News; + public interface NewsService { /** * 发布新闻 + * * @param date * @return */ void pushNews(String date); - + /** * 下架新闻 + * * @param date * @return */ void offlineNews(String date); - + + List findTopNews(String city); + + List findHousingEstate(String city); } 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 ed11bfa..b5cefe1 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 @@ -1,5 +1,7 @@ package com.fangjia.job.youfang.service; +import java.util.List; + import org.springframework.stereotype.Service; import com.cxytiandi.jdbc.EntityService; @@ -8,16 +10,36 @@ import com.fangjia.job.youfang.po.News; @Service public class NewsServiceImpl extends EntityService implements NewsService { + private static final int TOP_STATUS = 1; + + private static final int ON_LINE_STATUS = 1; + + private static final String NEWS_TYPE = "新闻"; + + private static final String HOUSING_ESTATE_TYPE = "推荐小区"; + @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); } + @Override + public List findTopNews(String city) { + return super.list(new String[] { "status", "top_status", "type", "city" }, + new Object[] { ON_LINE_STATUS, TOP_STATUS, NEWS_TYPE, city }); + } + + @Override + public List findHousingEstate(String city) { + return super.list(new String[] { "status", "type", "city" }, + new Object[] { ON_LINE_STATUS, HOUSING_ESTATE_TYPE, city }); + } + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java index 81c2c76..5fd78b8 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java @@ -1,8 +1,5 @@ package com.fangjia.job.youfang.service; -import com.fangjia.job.youfang.po.PushMessage; - public interface PushMessageService { - - void insert(PushMessage message); + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java index 79d6b3f..aa73730 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java @@ -8,10 +8,4 @@ import com.fangjia.job.youfang.po.PushMessage; @Service public class PushMessageServiceImpl extends EntityService implements PushMessageService { - @Override - public void insert(PushMessage message) { - // TODO Auto-generated method stub - - } - } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java index 223c9e9..0d314fd 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageService.java @@ -1,10 +1,5 @@ package com.fangjia.job.youfang.service; -import com.fangjia.job.youfang.po.PushRecordMessage; - public interface PushRecordMessageService { - PushRecordMessage findByUidAndMid(long uid,long mid); - - void insert(PushRecordMessage message); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java index 584ac32..fb284ac 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushRecordMessageServiceImpl.java @@ -3,22 +3,9 @@ package com.fangjia.job.youfang.service; import org.springframework.stereotype.Service; import com.cxytiandi.jdbc.EntityService; -import com.fangjia.job.youfang.po.AdVisitLog; import com.fangjia.job.youfang.po.PushRecordMessage; @Service public class PushRecordMessageServiceImpl extends EntityService implements PushRecordMessageService { - @Override - public PushRecordMessage findByUidAndMid(long uid, long mid) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void insert(PushRecordMessage message) { - // TODO Auto-generated method stub - - } - } From 3d27184a0011decfa2813ba33e6b6f0a484240ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 18 May 2018 14:32:56 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=8F=90=E9=86=92?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/util/DateUtilCustom.java | 26 +++ .../job/youfang/job/HouseRentNoticeJob.java | 149 +++++++++++++++++- .../service/EnterpriseProductUserService.java | 2 + .../EnterpriseProductUserServiceImpl.java | 5 + .../job/youfang/service/HouseInfoService.java | 9 ++ .../youfang/service/HouseInfoServiceImpl.java | 7 + 6 files changed, 192 insertions(+), 6 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java index 34f5d34..7f9372d 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java @@ -1,5 +1,6 @@ package com.fangjia.job.common.util; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -128,6 +129,31 @@ public class DateUtilCustom { return map; } + /** + * 计算两个日期之间相差的天数 + * @param smdate 较小的时间 + * @param bdate 较大的时间 + * @return 相差天数 + * @throws ParseException + */ + public static int between(Date smdate,Date bdate) { + try { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + smdate=sdf.parse(sdf.format(smdate)); + bdate=sdf.parse(sdf.format(bdate)); + Calendar cal = Calendar.getInstance(); + cal.setTime(smdate); + long time1 = cal.getTimeInMillis(); + cal.setTime(bdate); + long time2 = cal.getTimeInMillis(); + long between_days=(time2-time1)/(1000*3600*24); + + return Integer.parseInt(String.valueOf(between_days)); + } catch (Exception e) { + return -1; + } + } + public static void main(String[] args) { System.err.println(JsonUtils.toJson(getLatelyDate(3))); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java index 7c382c8..02de523 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java @@ -1,15 +1,25 @@ package com.fangjia.job.youfang.job; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.concurrent.CountDownLatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; + +import com.cxytiandi.jdbc.util.DateUtils; +import com.cxytiandi.jdbc.util.PageBean; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; -import com.fangjia.job.common.base.Response; -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.remote.FshApiRemoteService; +import com.fangjia.job.common.core.FangjiaThreadPoolExecutor; +import com.fangjia.job.common.util.DateUtilCustom; +import com.fangjia.job.youfang.po.EnterpriseProductUser; +import com.fangjia.job.youfang.po.HouseInfo; +import com.fangjia.job.youfang.service.EnterpriseProductUserService; +import com.fangjia.job.youfang.service.HouseInfoService; /** * 房产租金提醒任务
@@ -23,10 +33,16 @@ public class HouseRentNoticeJob implements SimpleJob { @Value("${fsh.url}") private String fshApiUrl; + @Autowired + private HouseInfoService houseInfoService; + + @Autowired + private EnterpriseProductUserService enterpriseProductUserService; + @Override public void execute(ShardingContext shardingContext) { logger.info("开始执行HouseRentNoticeJob"); - FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, fshApiUrl); + /*FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, fshApiUrl); for (int i = 0; i < 300; i++) { try { Response response = fshApiRemoteService.sendHouseRentNotice("goojia123456"); @@ -43,8 +59,129 @@ public class HouseRentNoticeJob implements SimpleJob { Thread.sleep(1000 * 60); } catch (InterruptedException e) { } + }*/ + + long total = houseInfoService.queryHouseAllCount(1L); + logger.info("total:" + total); + int pages = PageBean.calcPages(total, 1000); + logger.info("pages:" + pages); + for (int i = 1; i <= pages; i++) { + logger.info("开始执行页数:" + i); + List houses = houseInfoService.queryHousesByPage(i, 1000, + new String[] { "id", "live_status", "lease_start_date", "lease_end_date", "uid", "rent_cycle", "rent_cycle_unit", "last_rent_date" }); + final CountDownLatch latch = new CountDownLatch(houses.size()); + for (HouseInfo house : houses) { + final HouseInfo h = house; + FangjiaThreadPoolExecutor.execute(new Runnable() { + + @Override + public void run() { + try { + if("出租".equals(h.getLiveStatus())) { + rentPush(h); + rentEndPush(h); + } + } catch (Exception e) { + logger.error("定时推送收租通知异常:"+h.getId(), e); + } finally { + latch.countDown(); + } + } + + }); + + } + + try { + latch.await(); + } catch (InterruptedException e) { + logger.error("推送收租通知等待异常", e); + } } logger.info("HouseRentNoticeJob执行结束"); } + // 收租提醒,提前7天通知 + private void rentPush(HouseInfo houseInfo) { + if(houseInfo.getId().equals(107419093023326208L)){ + System.out.println("a"); + } + int unitMonth = houseInfo.getRentCycle() * 1; + if("季".equals(houseInfo.getRentCycleUnit())){ + unitMonth = houseInfo.getRentCycle() * 3; + }else if("年".equals(houseInfo.getRentCycleUnit())){ + unitMonth = houseInfo.getRentCycle() * 12; + } + //共多少月 + if (houseInfo.getLeaseEndDate() == null || houseInfo.getLeaseStartDate() == null) { + return; + } + int months = (houseInfo.getLeaseEndDate().getYear() - houseInfo.getLeaseStartDate().getYear())*12 + (houseInfo.getLeaseEndDate().getMonth() - houseInfo.getLeaseStartDate().getMonth()); + if(houseInfo.getLeaseEndDate().getDate()- houseInfo.getLeaseStartDate().getDate()>0){ + months = months + 1; + } + //共多少期 + int sumCycle = (int) Math.ceil(months*1.0/unitMonth); + + Date date = new Date(); + int months2 = (date.getYear() - houseInfo.getLeaseStartDate().getYear())*12 + (date.getMonth() - houseInfo.getLeaseStartDate().getMonth()); + + int count = (int) Math.floor(months2*1.0/unitMonth); + int stage = 0; + //第几期 + if(count + 2<=sumCycle){ + stage = count+2;//默认开始为一期,再加1是下一期 + }else{ + stage = sumCycle;//默认开始为一期,再加1是下一期 + } + Date nextDay = null; + if(count + 1=1 && date.getTime()<=lastNextDay.getTime()){ + stage = stage-1; + nextDay = lastNextDay; + } + }else{ + nextDay = org.apache.commons.lang3.time.DateUtils.addMonths(houseInfo.getLeaseStartDate(), (sumCycle-1)*unitMonth); + nextDay.setDate(houseInfo.getLastRentDate().getDate()); + + Date lastNextDay = org.apache.commons.lang3.time.DateUtils.addMonths(nextDay, -1*unitMonth); + date = org.apache.commons.lang3.time.DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + if(stage>=1 && date.getTime() queryAddUser(String start, String end); + + EnterpriseProductUser getById(Long id, String[] fields); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/EnterpriseProductUserServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/EnterpriseProductUserServiceImpl.java index 06bfdcf..eeab168 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/EnterpriseProductUserServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/EnterpriseProductUserServiceImpl.java @@ -42,4 +42,9 @@ public class EnterpriseProductUserServiceImpl extends EntityService queryHousesByPage(int page, int limit, String[] fields); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/HouseInfoServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/HouseInfoServiceImpl.java index d5d5477..8b6ec74 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/HouseInfoServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/HouseInfoServiceImpl.java @@ -7,6 +7,7 @@ import java.util.TreeMap; import org.springframework.stereotype.Service; import com.cxytiandi.jdbc.EntityService; +import com.cxytiandi.jdbc.util.PageBean; import com.fangjia.job.youfang.po.HouseInfo; @Service @@ -122,5 +123,11 @@ public class HouseInfoServiceImpl extends EntityService implements Ho } return sum; } + + @Override + public List queryHousesByPage(int page, int limit, String[] fields) { + int start = PageBean.page2Start(page, limit); + return super.listForPage(fields, "remove_status", 0, start, limit); + } } From 610eef1611f9cefdcca40cfbc56cfb96401559fa Mon Sep 17 00:00:00 2001 From: bayi Date: Fri, 18 May 2018 15:25:05 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E6=8E=92=E5=90=8D=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/base/FangjiaConstant.java | 22 +++ .../job/youfang/dto/CityNewPriceDto.java | 75 ++++++++ .../youfang/dto/CityNewPriceResultDto.java | 18 ++ .../job/youfang/dto/CityStatInfoDto.java | 133 +++++++++++++ .../job/youfang/dto/RegionSellStatDto.java | 64 +++++++ .../job/youfang/job/CityRankingSendJob.java | 176 ++++++++++++++++-- .../youfang/job/HousingEstateNewsSendJob.java | 54 +++++- .../job/youfang/job/TopNewsSendJob.java | 64 +++++-- .../youfang/remote/FshApiRemoteService.java | 40 ++-- .../youfang/service/CitySendLogService.java | 2 +- .../service/CitySendLogServiceImpl.java | 9 +- 11 files changed, 611 insertions(+), 46 deletions(-) create mode 100644 fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceDto.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceResultDto.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/RegionSellStatDto.java diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java new file mode 100644 index 0000000..a453a64 --- /dev/null +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -0,0 +1,22 @@ +package com.fangjia.job.common.base; + +public class FangjiaConstant { + + /* + * CitySendLog的推送类型 0.置顶咨询推送,1.小区推送 2.涨幅排行推送 3.跌幅排行推送 4.潜力排行推送 + */ + public static final byte NEWS_SEND_TYPE = 0; + + public static final byte HOUSING_ESTATE_SEND_TYPE = 1; + + public static final byte INCREASE_SEND_TYPE = 2; + + public static final byte DECLINES_SEND_TYPE = 3; + + public static final byte POTENTIAL_SEND_TYPE = 4; + + public static String FANGJIA_API_TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; + + public static final int SUCCESS_RESPONSE_CODE = 200; + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceDto.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceDto.java new file mode 100644 index 0000000..447a5f3 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceDto.java @@ -0,0 +1,75 @@ +package com.fangjia.job.youfang.dto; + +import java.util.List; + +public class CityNewPriceDto { + + /** + * 上涨数量 + */ + private Integer upCount; + /** + * 下跌量 + */ + private Integer downCount; + /** + * 平均上涨幅度 + */ + private Double avgUp; + /** + * 平均下跌幅度 + */ + private Double avgDown; + + private List rets; + + private List regionRets; + + /** + * 城市年涨跌幅 + */ + private Double yoy; + + public Integer getUpCount() { + return upCount; + } + public void setUpCount(Integer upCount) { + this.upCount = upCount; + } + public Integer getDownCount() { + return downCount; + } + public void setDownCount(Integer downCount) { + this.downCount = downCount; + } + public Double getAvgUp() { + return avgUp; + } + public void setAvgUp(Double avgUp) { + this.avgUp = avgUp; + } + public Double getAvgDown() { + return avgDown; + } + public void setAvgDown(Double avgDown) { + this.avgDown = avgDown; + } + public List getRets() { + return rets; + } + public void setRets(List rets) { + this.rets = rets; + } + public List getRegionRets() { + return regionRets; + } + public void setRegionRets(List regionRets) { + this.regionRets = regionRets; + } + public Double getYoy() { + return yoy; + } + public void setYoy(Double yoy) { + this.yoy = yoy; + } +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceResultDto.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceResultDto.java new file mode 100644 index 0000000..3fba313 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityNewPriceResultDto.java @@ -0,0 +1,18 @@ +package com.fangjia.job.youfang.dto; + +import com.fangjia.job.common.base.ReponseData; + +public class CityNewPriceResultDto extends ReponseData { + + private CityNewPriceDto result; + + public CityNewPriceDto getResult() { + return result; + } + + public void setResult(CityNewPriceDto result) { + this.result = result; + } + + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java new file mode 100644 index 0000000..7dc5b20 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java @@ -0,0 +1,133 @@ +package com.fangjia.job.youfang.dto; + +public class CityStatInfoDto { + + private String id; + private String city; + private Integer statDate; + private Integer avgPrice; + private Integer index; + private Double markup; + private Double rentRate; + private Double yoyMarkup; + // 全国涨幅排名 + private int rangeLevel; + // 下跌概率(用潜力指数计算,大于50的是上涨概率,小于50的用100-指数=下跌概率) + private Integer downChance; + // 是否关注该城市(定位城市数据页面使用) + private boolean follow; + + public boolean isFollow() { + return follow; + } + + public void setFollow(boolean follow) { + this.follow = follow; + } + + public Integer getDownChance() { + if (index == null) { + index = 0; + } + if (index != null && index > 50) { + this.downChance = index; + } else { + this.downChance = 100 - index; + } + return downChance; + } + + public void setDownChance(Integer downChance) { + this.downChance = downChance; + } + + public int getRangeLevel() { + return rangeLevel; + } + + public void setRangeLevel(int rangeLevel) { + this.rangeLevel = rangeLevel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public Integer getStatDate() { + return statDate; + } + + public void setStatDate(Integer statDate) { + this.statDate = statDate; + } + + public Integer getAvgPrice() { + if (avgPrice == null) { + return 0; + } + return avgPrice; + } + + public void setAvgPrice(Integer avgPrice) { + this.avgPrice = avgPrice; + } + + public Integer getIndex() { + if (index == null) { + return 0; + } + return index; + } + + public void setIndex(Integer index) { + this.index = index; + } + + public Double getMarkup() { + if (markup == null) { + return 0D; + } + return markup; + } + + public void setMarkup(Double markup) { + this.markup = markup; + } + + public Double getRentRate() { + return rentRate; + } + + public void setRentRate(Double rentRate) { + this.rentRate = rentRate; + } + + public Double getYoyMarkup() { + return yoyMarkup; + } + + public void setYoyMarkup(Double yoyMarkup) { + this.yoyMarkup = yoyMarkup; + } + + // 为实现深copy + @Override + public CityStatInfoDto clone() throws CloneNotSupportedException { + CityStatInfoDto dto = null; + dto = (CityStatInfoDto) super.clone(); + return dto; + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/RegionSellStatDto.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/RegionSellStatDto.java new file mode 100644 index 0000000..a8938aa --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/RegionSellStatDto.java @@ -0,0 +1,64 @@ +package com.fangjia.job.youfang.dto; + +import java.util.Date; + +public class RegionSellStatDto { + private String id; + private String city; + private String region; + private Integer avgPrice; + private Integer date; + private Date updateDate; + private Double mom; + private Double yoy; + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getCity() { + return city; + } + public void setCity(String city) { + this.city = city; + } + public String getRegion() { + return region; + } + public void setRegion(String region) { + this.region = region; + } + public Integer getAvgPrice() { + return avgPrice; + } + public void setAvgPrice(Integer avgPrice) { + this.avgPrice = avgPrice; + } + public Integer getDate() { + return date; + } + public void setDate(Integer date) { + this.date = date; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + public Double getMom() { + return mom; + } + public void setMom(Double mom) { + this.mom = mom; + } + public Double getYoy() { + return yoy; + } + public void setYoy(Double yoy) { + this.yoy = yoy; + } + + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 0ba027b..11ccc7d 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -1,34 +1,186 @@ package com.fangjia.job.youfang.job; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; - +import org.springframework.beans.factory.annotation.Value; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.common.base.FangjiaConstant; +import com.fangjia.job.common.util.RestApiCallUtils; +import com.fangjia.job.youfang.document.CitySendLog; +import com.fangjia.job.youfang.dto.CityNewPriceDto; +import com.fangjia.job.youfang.dto.CityNewPriceResultDto; +import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.remote.FshApiRemoteService; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; -import com.fangjia.job.youfang.service.PushMessageService; -import com.fangjia.job.youfang.service.PushRecordMessageService; +import com.fangjia.job.youfang.dto.CityStatInfoDto; public class CityRankingSendJob implements SimpleJob { - + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); - + @Autowired private CityCollectService cityCollectService; - + @Autowired private CitySendLogService citySendLogService; - + + @Value("${open.url}") + private String openApiUrl; + + private static final int NUM = 10;// 排名前10 @Override public void execute(ShardingContext context) { - LOG.info("城市排名推送开始,context:"+context); - //1.查询 - //2.对比 - //3.发送 - //4.记录 + LOG.info("城市排名推送开始,context:" + context); + // 1.查询 + // 查询全部城市 + FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, openApiUrl); + CityNewPriceResultDto resultDto = fshApiRemoteService.getAllCitys(FangjiaConstant.FANGJIA_API_TOKEN); + List topTenList = new ArrayList(); + List bottomTenList = new ArrayList(); + List potentialTenList = new ArrayList(); + // 排序,整理出涨幅,跌幅,潜力的前10 + if (null != resultDto && resultDto.getCode() == FangjiaConstant.SUCCESS_RESPONSE_CODE) { + CityNewPriceDto dto = resultDto.getResult(); + if (null != dto && null != dto.getRets()) { + List rets = dto.getRets(); + // 涨幅排序 + List upList = rets.stream() + .sorted((u1, u2) -> u2.getMarkup().compareTo(u1.getMarkup())).collect(Collectors.toList()); + List copyList = new ArrayList(); + Iterator upIter = upList.iterator(); + try { + // 涨幅排序深复制 + while (upIter.hasNext()) { + copyList.add(upIter.next().clone()); + } + // 涨幅前10 + topTenList = copyList.subList(0, NUM); + // 跌幅前10 + bottomTenList = copyList.subList(copyList.size() - NUM, copyList.size()); + Collections.reverse(bottomTenList);// 涨幅后10名倒序 + // 潜力排序 + List potentialList = rets.stream() + .sorted((u1, u2) -> u2.getIndex().compareTo(u1.getIndex())).collect(Collectors.toList()); + potentialTenList = potentialList.subList(0, NUM); + } catch (CloneNotSupportedException e) { + // 深复制失败 + LOG.error("深复制失败", e); + // 涨幅前10 + topTenList = upList.subList(0, NUM); + // 跌幅前10 + bottomTenList = upList.subList(copyList.size() - NUM, copyList.size()); + Collections.reverse(bottomTenList);// 涨幅后10名倒序 + // 深复制失败,再次访问,用新list做潜力排序 + CityNewPriceResultDto resultDto2 = fshApiRemoteService + .getAllCitys(FangjiaConstant.FANGJIA_API_TOKEN); + CityNewPriceDto dto2 = resultDto2.getResult(); + List rets2 = dto2.getRets(); + // 潜力排序 + List potentialList = rets2.stream() + .sorted((u1, u2) -> u2.getIndex().compareTo(u1.getIndex())).collect(Collectors.toList()); + potentialTenList = potentialList.subList(0, NUM); + } + } + } + // 查询用户 + List cityList = cityCollectService.findAll(); + // 用于性能节省的变量 + String cityName = ""; + Integer topRankings = null; + Integer bottomRankings = null; + Integer potentialRankings = null; + // 2.对比 + for (CityCollect city : cityList) { + // cityList已排序好,如果cityName不变,则使用上个排名 + if (cityName.equals(city.getCity())) { + try { + baseSend(city, topRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendRankings(city, bottomRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendRankings(city, potentialRankings, FangjiaConstant.POTENTIAL_SEND_TYPE); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } else { + // 如果cityName改变,则查询替换cityName和排名 + cityName = city.getCity(); + try { + topRankings = sendRankings(city, topTenList, FangjiaConstant.INCREASE_SEND_TYPE); + bottomRankings = sendRankings(city, bottomTenList, FangjiaConstant.DECLINES_SEND_TYPE); + potentialRankings = sendRankings(city, potentialTenList, FangjiaConstant.POTENTIAL_SEND_TYPE); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } + } + } + + /** + * 首次遍历,并返回排名,没有则返回null + * + * @param city + * @param list + * @param sendType + * @return + */ + private Integer sendRankings(CityCollect city, List list, byte sendType) { + List sendList = citySendLogService.find(city.getUid(), null, sendType); + if ((null == sendList || sendList.isEmpty()) && !list.isEmpty()) { + for (int i = 0; i <= list.size(); i++) { + if (city.getCity().equals(list.get(i).getCity())) { + int rankings = i + 1;// 排名 + baseSend(city, rankings, sendType); + return rankings; + } + } + } + return null; + } + + /** + * 再次遍历,直接使用上次的排名 + * + * @param city + * @param rankings + * @param sendType + */ + private void sendRankings(CityCollect city, Integer rankings, byte sendType) { + List sendList = citySendLogService.find(city.getUid(), null, sendType); + if ((null == sendList || sendList.isEmpty()) && null != rankings) { + baseSend(city, rankings, sendType); + } + } + + /** + * 发送并保存 + * + * @param city + * @param rankings + * @param sendType + */ + private void baseSend(CityCollect city, Integer rankings, byte sendType) { + String title = null; + if (FangjiaConstant.INCREASE_SEND_TYPE == sendType) { + title = "全国城市涨幅排名第" + rankings + "位"; + } else if (FangjiaConstant.DECLINES_SEND_TYPE == sendType) { + title = "全国城市跌幅排名第" + rankings + "位"; + + } else { + title = "全国城市潜力排名第" + rankings + "位"; + } + LOG.info("全国城市涨幅(跌幅、潜力)排名推送开始,uid:" + city.getUid() + ",city:" + city.getCity()); + // 发送 + // TODO + // 记录 + citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType); } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index c126c8d..897b92c 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -1,16 +1,20 @@ package com.fangjia.job.youfang.job; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.common.base.FangjiaConstant; +import com.fangjia.job.youfang.document.CitySendLog; +import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.po.News; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; import com.fangjia.job.youfang.service.NewsService; -import com.fangjia.job.youfang.service.PushMessageService; -import com.fangjia.job.youfang.service.PushRecordMessageService; public class HousingEstateNewsSendJob implements SimpleJob { @@ -28,10 +32,48 @@ public class HousingEstateNewsSendJob implements SimpleJob { @Override public void execute(ShardingContext context) { LOG.info("城市小区推送开始,context:"+context); - //1.查询 - //2.对比 - //3.发送 - //4.记录 + // 1.查询 + List cityList = cityCollectService.findAll(); + String cityName = ""; + List newsList = null; + // 2.对比 + for (CityCollect city : cityList) { + // cityList已排序好,如果cityName不变,则使用上个newsList + if (cityName.equals(city.getCity())) { + try { + sendNews(city, newsList); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } else { + // 如果cityName改变,则查询替换cityName和newsList + cityName = city.getCity(); + newsList = newsService.findHousingEstate(cityName); + try { + sendNews(city, newsList); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } + } + } + + private void sendNews(CityCollect city, List newsList) { + if (null != newsList && !newsList.isEmpty()) { + for (News n : newsList) { + List sendList = citySendLogService.find(city.getUid(), n.getId(), + FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); + // 未推送过的推送 + if (null == sendList || sendList.isEmpty()) { + LOG.info("小区推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); + // 3.发送 + // TODO + // 4.记录 + citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); + } + } + } + } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 43bea83..896574b 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -1,37 +1,77 @@ package com.fangjia.job.youfang.job; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; - import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.fangjia.job.common.base.FangjiaConstant; +import com.fangjia.job.youfang.document.CitySendLog; +import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.po.News; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; import com.fangjia.job.youfang.service.NewsService; -import com.fangjia.job.youfang.service.PushMessageService; -import com.fangjia.job.youfang.service.PushRecordMessageService; public class TopNewsSendJob implements SimpleJob { - + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); - + @Autowired private CityCollectService cityCollectService; - + @Autowired private CitySendLogService citySendLogService; - + @Autowired private NewsService newsService; @Override public void execute(ShardingContext context) { - LOG.info("城市置顶咨询推送开始,context:"+context); - //1.查询 - //2.对比 - //3.发送 - //4.记录 + LOG.info("城市置顶咨询推送开始,context:" + context); + // 1.查询 + List cityList = cityCollectService.findAll(); + String cityName = ""; + List newsList = null; + // 2.对比 + for (CityCollect city : cityList) { + // cityList已排序好,如果cityName不变,则使用上个newsList + if (cityName.equals(city.getCity())) { + try { + sendNews(city, newsList); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } else { + // 如果cityName改变,则查询替换cityName和newsList + cityName = city.getCity(); + newsList = newsService.findTopNews(cityName); + try { + sendNews(city, newsList); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } + } + } + + private void sendNews(CityCollect city, List newsList) { + if (null != newsList && !newsList.isEmpty()) { + for (News n : newsList) { + List sendList = citySendLogService.find(city.getUid(), n.getId(), + FangjiaConstant.NEWS_SEND_TYPE); + // 未推送过的推送 + if (null == sendList || sendList.isEmpty()) { + LOG.info("新闻推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); + // 3.发送 + // TODO + // 4.记录 + citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.NEWS_SEND_TYPE); + } + } + } + } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java index 358e687..83e00b1 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java @@ -6,6 +6,7 @@ import com.fangjia.job.common.base.Response; import com.fangjia.job.youfang.document.DistrictEvaluateSingleDto; import com.fangjia.job.youfang.document.DistrictInfoDto; import com.fangjia.job.youfang.document.DistrictSearchSingleDto; +import com.fangjia.job.youfang.dto.CityNewPriceResultDto; import com.fangjia.job.youfang.dto.DistrictDetailDto; import feign.Param; @@ -14,66 +15,77 @@ import feign.RequestLine; /** * API调用接口定义 + * * @author yinjihuan */ public interface FshApiRemoteService { - + /** * 发送月涨幅计算通知 + * * @param token * @return */ @RequestLine("GET /rest/houses/rose/month?token={token}") - public Response sendHouseRoseMonthNotice(@Param("token")String token); - + public Response sendHouseRoseMonthNotice(@Param("token") String token); + /** * 发送租金提醒计算通知 + * * @param token * @return */ @RequestLine("GET /rest/houses/rent/notice?token={token}") - public Response sendHouseRentNotice(@Param("token")String token); - + public Response sendHouseRentNotice(@Param("token") String token); + /** * 定时估价操作,并算出周涨跌幅通知 + * * @param token * @return */ @RequestLine("GET /rest/houses/eval?token={token}") - public Response evalAllHousePrice(@Param("token")String token); - + public Response evalAllHousePrice(@Param("token") String token); + @RequestLine("GET /fsh/getAgencyInfo") - public Map getAgencyInfo(@QueryMap Map queryMap); - + public Map getAgencyInfo(@QueryMap Map queryMap); + /** * 获取小区综合信息district_new_price + * * @param queryMap * @return */ @RequestLine("GET /fsh/getDistrictNewPriceInfo") public DistrictEvaluateSingleDto getDistrictNewPriceInfo(@QueryMap Map queryMap); - + /** * 小区详情 */ @RequestLine("GET /fsh/detail") public DistrictInfoDto detail(@QueryMap Map queryMap); - - //小区估价接口 + + // 小区估价接口 @RequestLine("GET /fsh/evaluate") public DistrictSearchSingleDto evaluate(@QueryMap Map queryMap); - + /** * 刷新小区详情页面缓存数据 + * * @param queryMap * @return */ @RequestLine("GET /district/details") public String refreshDistrictDetailPageData(@QueryMap Map queryMap); - + /** * 小区信息汇总 */ @RequestLine("GET /fsh/districtDetail") public DistrictDetailDto districtDetail(@QueryMap Map queryMap); + + // 城市列表 + @RequestLine("GET /quotations/cityList?token={token}") + public CityNewPriceResultDto getAllCitys(@Param("token") String token); + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java index bc88256..acf0683 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java @@ -6,7 +6,7 @@ import com.fangjia.job.youfang.document.CitySendLog; public interface CitySendLogService { - void save(CitySendLog log); + void save(String city, Long uid, Long nId, byte sendType); List find(long uid, Long newsId, Byte sendType); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java index 7d00b6c..ebd1c94 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java @@ -1,4 +1,5 @@ package com.fangjia.job.youfang.service; + import java.util.Calendar; import java.util.Date; import java.util.List; @@ -18,7 +19,13 @@ public class CitySendLogServiceImpl implements CitySendLogService { private MongoTemplate mongoTemplate; @Override - public void save(CitySendLog log) { + public void save(String city, Long uid, Long nId, byte sendType) { + CitySendLog log = new CitySendLog(); + log.setCity(city); + log.setNewsId(nId); + log.setSendTime(new Date()); + log.setSendType(sendType); + log.setUid(uid); mongoTemplate.save(log); } From 476b979ab9a389be6dd55819a3d30a151af6fd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 18 May 2018 16:05:42 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/youfang/job/HouseRentNoticeJob.java | 31 ++++++-- .../job/youfang/param/PushMessageParam.java | 71 +++++++++++++++++++ .../youfang/remote/FshApiRemoteService.java | 8 +++ .../youfang/service/PushMessageService.java | 8 +++ .../service/PushMessageServiceImpl.java | 34 ++++++++- 5 files changed, 144 insertions(+), 8 deletions(-) create mode 100644 fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/param/PushMessageParam.java diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java index 02de523..b5a35fb 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java @@ -16,14 +16,16 @@ import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.core.FangjiaThreadPoolExecutor; import com.fangjia.job.common.util.DateUtilCustom; +import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.EnterpriseProductUser; import com.fangjia.job.youfang.po.HouseInfo; import com.fangjia.job.youfang.service.EnterpriseProductUserService; import com.fangjia.job.youfang.service.HouseInfoService; +import com.fangjia.job.youfang.service.PushMessageService; /** * 房产租金提醒任务
- * 每天触发一次,逻辑在服务端 + * 每天触发一次 * @author yinjihuan */ public class HouseRentNoticeJob implements SimpleJob { @@ -39,6 +41,9 @@ public class HouseRentNoticeJob implements SimpleJob { @Autowired private EnterpriseProductUserService enterpriseProductUserService; + @Autowired + private PushMessageService pushMessageService; + @Override public void execute(ShardingContext shardingContext) { logger.info("开始执行HouseRentNoticeJob"); @@ -103,9 +108,6 @@ public class HouseRentNoticeJob implements SimpleJob { // 收租提醒,提前7天通知 private void rentPush(HouseInfo houseInfo) { - if(houseInfo.getId().equals(107419093023326208L)){ - System.out.println("a"); - } int unitMonth = houseInfo.getRentCycle() * 1; if("季".equals(houseInfo.getRentCycleUnit())){ unitMonth = houseInfo.getRentCycle() * 3; @@ -162,8 +164,16 @@ public class HouseRentNoticeJob implements SimpleJob { if (nextDay != null) { int days = DateUtilCustom.between(new Date(), nextDay); if (days == 7) { + EnterpriseProductUser user = enterpriseProductUserService.getById(Long.parseLong(houseInfo.getUid()), new String[] { "push_client_id" }); String pushMsg = DateUtils.date2Str(nextDay, "yyyy年MM月dd日") + "是您的到期收租日,又要有现金到账咯,请注意查收。详情请点击查看。"; - System.err.println(pushMsg); + logger.info(pushMsg); + PushMessageParam param = new PushMessageParam(); + param.setTitle("收租提醒"); + param.setContent(pushMsg); + param.setOperation(1); + param.setOperationPage(""); + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); } } } @@ -179,9 +189,16 @@ public class HouseRentNoticeJob implements SimpleJob { // 判断当前时间距离到期日期的天数,在30天和15天的时候进行推送 int days = DateUtilCustom.between(new Date(), leaseEndDate); if(days == 15 || days == 30) { - String pushMsg = DateUtils.date2Str(leaseEndDate, "yyyy年MM月dd日") + "您的房子租期就到了,快来看看现在的市场租金价格吧。详情请点击查看。"; - System.err.println(pushMsg); EnterpriseProductUser user = enterpriseProductUserService.getById(Long.parseLong(house.getUid()), new String[] { "push_client_id" }); + String pushMsg = DateUtils.date2Str(leaseEndDate, "yyyy年MM月dd日") + "您的房子租期就到了,快来看看现在的市场租金价格吧。详情请点击查看。"; + logger.info(pushMsg); + PushMessageParam param = new PushMessageParam(); + param.setTitle("收租提醒"); + param.setContent(pushMsg); + param.setOperation(1); + param.setOperationPage(""); + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); } } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/param/PushMessageParam.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/param/PushMessageParam.java new file mode 100644 index 0000000..54c9576 --- /dev/null +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/param/PushMessageParam.java @@ -0,0 +1,71 @@ +package com.fangjia.job.youfang.param; + +public class PushMessageParam { + + // 标题 + private String title; + + // 内容 + private String content; + + // 通知操作(0:打开应用,1:打开指定页面,2:打开url) + private int operation; + + // 当通知操作为打开具体页面时这个值就是页面的值,当为打开url时这个值就是url的值 + private String operationPage; + + // 推送ID + private String pushClientId; + + // 推送给哪个用户 + private Long userId; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public int getOperation() { + return operation; + } + + public void setOperation(int operation) { + this.operation = operation; + } + + public String getOperationPage() { + return operationPage; + } + + public void setOperationPage(String operationPage) { + this.operationPage = operationPage; + } + + public String getPushClientId() { + return pushClientId; + } + + public void setPushClientId(String pushClientId) { + this.pushClientId = pushClientId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + +} diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java index 358e687..69eaa7d 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/remote/FshApiRemoteService.java @@ -76,4 +76,12 @@ public interface FshApiRemoteService { */ @RequestLine("GET /fsh/districtDetail") public DistrictDetailDto districtDetail(@QueryMap Map queryMap); + + /** + * 消息推送接口 + * @param queryMap + * @return + */ + @RequestLine("POST /rest/message/push") + public Response pushMessage(@QueryMap Map queryMap); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java index 5fd78b8..402e279 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java @@ -1,5 +1,13 @@ package com.fangjia.job.youfang.service; +import com.fangjia.job.youfang.param.PushMessageParam; + public interface PushMessageService { + /** + * 推送消息 + * @param param + */ + void push(PushMessageParam param); + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java index aa73730..ebe19a6 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java @@ -1,11 +1,43 @@ package com.fangjia.job.youfang.service; +import java.util.HashMap; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; - import com.cxytiandi.jdbc.EntityService; +import com.fangjia.job.common.util.DingDingMessageUtil; +import com.fangjia.job.common.util.RestApiCallUtils; +import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.PushMessage; +import com.fangjia.job.youfang.remote.FshApiRemoteService; @Service public class PushMessageServiceImpl extends EntityService implements PushMessageService { + private Logger logger = LoggerFactory.getLogger(PushMessageServiceImpl.class); + + @Value("${fsh.url}") + private String fshApiUrl; + + @Override + public void push(PushMessageParam param) { + FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, fshApiUrl); + try { + Map params = new HashMap(); + params.put("token", "goojia123456"); + params.put("title", param.getTitle()); + params.put("content", param.getContent()); + params.put("operation", param.getOperation()); + params.put("operationPage", param.getOperationPage()); + params.put("pushClientId", param.getPushClientId()); + params.put("userId", param.getUserId()); + fshApiRemoteService.pushMessage(params); + } catch (Exception e) { + logger.error("消息推送异常:", e); + DingDingMessageUtil.sendTextMessage("消息推送异常:" + e.getMessage()); + } + } + } From d6db206b8386a75566b15c20ed6f653135b80e74 Mon Sep 17 00:00:00 2001 From: bayi Date: Fri, 18 May 2018 17:17:27 +0800 Subject: [PATCH 08/26] =?UTF-8?q?JDK=E7=89=88=E6=9C=AC=E6=8C=87=E5=AE=9A1.?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangjia-job/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fangjia-job/pom.xml b/fangjia-job/pom.xml index 9618749..d41e3d0 100644 --- a/fangjia-job/pom.xml +++ b/fangjia-job/pom.xml @@ -90,4 +90,18 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + \ No newline at end of file From 8c8311e17af4c1b0d20c877662fe672512977bea Mon Sep 17 00:00:00 2001 From: bayi Date: Fri, 18 May 2018 17:51:51 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/youfang/job/CityRankingSendJob.java | 26 +++++++++++-- .../youfang/job/HousingEstateNewsSendJob.java | 39 ++++++++++++++----- .../job/youfang/job/TopNewsSendJob.java | 23 ++++++++++- 3 files changed, 74 insertions(+), 14 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 11ccc7d..eb6853e 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -17,10 +17,14 @@ import com.fangjia.job.youfang.document.CitySendLog; import com.fangjia.job.youfang.dto.CityNewPriceDto; import com.fangjia.job.youfang.dto.CityNewPriceResultDto; import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.po.EnterpriseProductUser; import com.fangjia.job.youfang.remote.FshApiRemoteService; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.EnterpriseProductUserService; +import com.fangjia.job.youfang.service.PushMessageService; import com.fangjia.job.youfang.dto.CityStatInfoDto; +import com.fangjia.job.youfang.param.PushMessageParam; public class CityRankingSendJob implements SimpleJob { @@ -31,6 +35,12 @@ public class CityRankingSendJob implements SimpleJob { @Autowired private CitySendLogService citySendLogService; + + @Autowired + private EnterpriseProductUserService enterpriseProductUserService; + + @Autowired + private PushMessageService pushMessageService; @Value("${open.url}") private String openApiUrl; @@ -169,16 +179,24 @@ public class CityRankingSendJob implements SimpleJob { private void baseSend(CityCollect city, Integer rankings, byte sendType) { String title = null; if (FangjiaConstant.INCREASE_SEND_TYPE == sendType) { - title = "全国城市涨幅排名第" + rankings + "位"; + title = city.getCity()+",全国城市涨幅排名第" + rankings + "位"; } else if (FangjiaConstant.DECLINES_SEND_TYPE == sendType) { - title = "全国城市跌幅排名第" + rankings + "位"; + title = city.getCity()+",全国城市跌幅排名第" + rankings + "位"; } else { - title = "全国城市潜力排名第" + rankings + "位"; + title = city.getCity()+",全国城市潜力排名第" + rankings + "位"; } LOG.info("全国城市涨幅(跌幅、潜力)排名推送开始,uid:" + city.getUid() + ",city:" + city.getCity()); // 发送 - // TODO + EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); + LOG.info(title); + PushMessageParam param = new PushMessageParam(); + param.setTitle("排行榜提醒"); + param.setContent(title); + param.setOperation(1); + param.setOperationPage(""); + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); // 记录 citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 897b92c..3981bd6 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -10,28 +10,38 @@ import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; import com.fangjia.job.youfang.document.CitySendLog; +import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.po.EnterpriseProductUser; import com.fangjia.job.youfang.po.News; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.EnterpriseProductUserService; import com.fangjia.job.youfang.service.NewsService; +import com.fangjia.job.youfang.service.PushMessageService; public class HousingEstateNewsSendJob implements SimpleJob { - + private static final Logger LOG = LoggerFactory.getLogger(TopNewsSendJob.class); - + @Autowired private CityCollectService cityCollectService; - + @Autowired private CitySendLogService citySendLogService; - + @Autowired private NewsService newsService; - + + @Autowired + private EnterpriseProductUserService enterpriseProductUserService; + + @Autowired + private PushMessageService pushMessageService; + @Override public void execute(ShardingContext context) { - LOG.info("城市小区推送开始,context:"+context); + LOG.info("城市小区推送开始,context:" + context); // 1.查询 List cityList = cityCollectService.findAll(); String cityName = ""; @@ -57,7 +67,7 @@ public class HousingEstateNewsSendJob implements SimpleJob { } } } - + private void sendNews(CityCollect city, List newsList) { if (null != newsList && !newsList.isEmpty()) { for (News n : newsList) { @@ -67,9 +77,20 @@ public class HousingEstateNewsSendJob implements SimpleJob { if (null == sendList || sendList.isEmpty()) { LOG.info("小区推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); // 3.发送 - // TODO + EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), + new String[] { "push_client_id" }); + String pushMsg = n.getContent(); + LOG.info(pushMsg); + PushMessageParam param = new PushMessageParam(); + param.setTitle(n.getTitle()); + param.setContent(pushMsg); + param.setOperation(1); + param.setOperationPage(""); + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); // 4.记录 - citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); + citySendLogService.save(city.getCity(), city.getUid(), n.getId(), + FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); } } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 896574b..6b2f28f 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -4,15 +4,21 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; + +import com.cxytiandi.jdbc.util.DateUtils; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; import com.fangjia.job.youfang.document.CitySendLog; +import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.CityCollect; +import com.fangjia.job.youfang.po.EnterpriseProductUser; import com.fangjia.job.youfang.po.News; import com.fangjia.job.youfang.service.CityCollectService; import com.fangjia.job.youfang.service.CitySendLogService; +import com.fangjia.job.youfang.service.EnterpriseProductUserService; import com.fangjia.job.youfang.service.NewsService; +import com.fangjia.job.youfang.service.PushMessageService; public class TopNewsSendJob implements SimpleJob { @@ -26,6 +32,12 @@ public class TopNewsSendJob implements SimpleJob { @Autowired private NewsService newsService; + + @Autowired + private EnterpriseProductUserService enterpriseProductUserService; + + @Autowired + private PushMessageService pushMessageService; @Override public void execute(ShardingContext context) { @@ -65,7 +77,16 @@ public class TopNewsSendJob implements SimpleJob { if (null == sendList || sendList.isEmpty()) { LOG.info("新闻推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); // 3.发送 - // TODO + EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); + String pushMsg = n.getContent(); + LOG.info(pushMsg); + PushMessageParam param = new PushMessageParam(); + param.setTitle(n.getTitle()); + param.setContent(pushMsg); + param.setOperation(1); + param.setOperationPage(""); + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); // 4.记录 citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.NEWS_SEND_TYPE); } From 86a84d522bae1d9cac85c60beb98daa1c166f457 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 21 May 2018 09:32:23 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/base/FangjiaConstant.java | 2 -- .../job/youfang/job/CityRankingSendJob.java | 21 +++++++++++-------- .../job/youfang/job/TopNewsSendJob.java | 1 - 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java index a453a64..f2b3ab2 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -15,8 +15,6 @@ public class FangjiaConstant { public static final byte POTENTIAL_SEND_TYPE = 4; - public static String FANGJIA_API_TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; - public static final int SUCCESS_RESPONSE_CODE = 200; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index eb6853e..ce485ca 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -35,16 +35,19 @@ public class CityRankingSendJob implements SimpleJob { @Autowired private CitySendLogService citySendLogService; - + @Autowired private EnterpriseProductUserService enterpriseProductUserService; - + @Autowired private PushMessageService pushMessageService; @Value("${open.url}") private String openApiUrl; + @Value("${FANGJIA_API_TOKEN}") + private String token; + private static final int NUM = 10;// 排名前10 @Override @@ -53,7 +56,7 @@ public class CityRankingSendJob implements SimpleJob { // 1.查询 // 查询全部城市 FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, openApiUrl); - CityNewPriceResultDto resultDto = fshApiRemoteService.getAllCitys(FangjiaConstant.FANGJIA_API_TOKEN); + CityNewPriceResultDto resultDto = fshApiRemoteService.getAllCitys(token); List topTenList = new ArrayList(); List bottomTenList = new ArrayList(); List potentialTenList = new ArrayList(); @@ -90,8 +93,7 @@ public class CityRankingSendJob implements SimpleJob { bottomTenList = upList.subList(copyList.size() - NUM, copyList.size()); Collections.reverse(bottomTenList);// 涨幅后10名倒序 // 深复制失败,再次访问,用新list做潜力排序 - CityNewPriceResultDto resultDto2 = fshApiRemoteService - .getAllCitys(FangjiaConstant.FANGJIA_API_TOKEN); + CityNewPriceResultDto resultDto2 = fshApiRemoteService.getAllCitys(token); CityNewPriceDto dto2 = resultDto2.getResult(); List rets2 = dto2.getRets(); // 潜力排序 @@ -179,16 +181,17 @@ public class CityRankingSendJob implements SimpleJob { private void baseSend(CityCollect city, Integer rankings, byte sendType) { String title = null; if (FangjiaConstant.INCREASE_SEND_TYPE == sendType) { - title = city.getCity()+",全国城市涨幅排名第" + rankings + "位"; + title = city.getCity() + ",全国城市涨幅排名第" + rankings + "位"; } else if (FangjiaConstant.DECLINES_SEND_TYPE == sendType) { - title = city.getCity()+",全国城市跌幅排名第" + rankings + "位"; + title = city.getCity() + ",全国城市跌幅排名第" + rankings + "位"; } else { - title = city.getCity()+",全国城市潜力排名第" + rankings + "位"; + title = city.getCity() + ",全国城市潜力排名第" + rankings + "位"; } LOG.info("全国城市涨幅(跌幅、潜力)排名推送开始,uid:" + city.getUid() + ",city:" + city.getCity()); // 发送 - EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); + EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), + new String[] { "push_client_id" }); LOG.info(title); PushMessageParam param = new PushMessageParam(); param.setTitle("排行榜提醒"); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 6b2f28f..195a4ce 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -5,7 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.cxytiandi.jdbc.util.DateUtils; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; From 3432328385467e25a54c811896430fe1eb92d596 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 21 May 2018 10:35:54 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/base/FangjiaConstant.java | 2 + .../job/youfang/job/CityRankingSendJob.java | 39 +++++++++++++--- .../youfang/job/HousingEstateNewsSendJob.java | 34 +++++++++----- .../job/youfang/job/TopNewsSendJob.java | 44 +++++++++++++------ 4 files changed, 89 insertions(+), 30 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java index f2b3ab2..8c3af6a 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -16,5 +16,7 @@ public class FangjiaConstant { public static final byte POTENTIAL_SEND_TYPE = 4; public static final int SUCCESS_RESPONSE_CODE = 200; + + public static final int SEND_THREAD_NUM = 100; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index ce485ca..a10571f 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,6 +52,8 @@ public class CityRankingSendJob implements SimpleJob { private static final int NUM = 10;// 排名前10 + private static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(FangjiaConstant.SEND_THREAD_NUM); + @Override public void execute(ShardingContext context) { LOG.info("城市排名推送开始,context:" + context); @@ -114,13 +118,7 @@ public class CityRankingSendJob implements SimpleJob { for (CityCollect city : cityList) { // cityList已排序好,如果cityName不变,则使用上个排名 if (cityName.equals(city.getCity())) { - try { - baseSend(city, topRankings, FangjiaConstant.INCREASE_SEND_TYPE); - sendRankings(city, bottomRankings, FangjiaConstant.INCREASE_SEND_TYPE); - sendRankings(city, potentialRankings, FangjiaConstant.POTENTIAL_SEND_TYPE); - } catch (Exception e) { - LOG.error("推送失败!", e); - } + THREAD_POOL.execute(new MyThread(city, topRankings, bottomRankings, potentialRankings)); } else { // 如果cityName改变,则查询替换cityName和排名 cityName = city.getCity(); @@ -204,4 +202,31 @@ public class CityRankingSendJob implements SimpleJob { citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType); } + class MyThread extends Thread { + + private Integer topRankings; + private Integer bottomRankings; + private Integer potentialRankings; + + private CityCollect city; + + public MyThread(CityCollect city, Integer topRankings, Integer bottomRankings, Integer potentialRankings) { + this.topRankings = topRankings; + this.bottomRankings = bottomRankings; + this.potentialRankings = potentialRankings; + this.city = city; + } + + @Override + public void run() { + try { + baseSend(city, topRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendRankings(city, bottomRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendRankings(city, potentialRankings, FangjiaConstant.POTENTIAL_SEND_TYPE); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } + } + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 3981bd6..da522e8 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -1,6 +1,8 @@ package com.fangjia.job.youfang.job; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +41,8 @@ public class HousingEstateNewsSendJob implements SimpleJob { @Autowired private PushMessageService pushMessageService; + private static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(FangjiaConstant.SEND_THREAD_NUM); + @Override public void execute(ShardingContext context) { LOG.info("城市小区推送开始,context:" + context); @@ -50,20 +54,12 @@ public class HousingEstateNewsSendJob implements SimpleJob { for (CityCollect city : cityList) { // cityList已排序好,如果cityName不变,则使用上个newsList if (cityName.equals(city.getCity())) { - try { - sendNews(city, newsList); - } catch (Exception e) { - LOG.error("推送失败!", e); - } + THREAD_POOL.execute(new MyThread(city, newsList)); } else { // 如果cityName改变,则查询替换cityName和newsList cityName = city.getCity(); newsList = newsService.findHousingEstate(cityName); - try { - sendNews(city, newsList); - } catch (Exception e) { - LOG.error("推送失败!", e); - } + THREAD_POOL.execute(new MyThread(city, newsList)); } } } @@ -94,7 +90,25 @@ public class HousingEstateNewsSendJob implements SimpleJob { } } } + } + class MyThread extends Thread { + private List news; + private CityCollect city; + + public MyThread(CityCollect city, List news) { + this.news = news; + this.city = city; + } + + @Override + public void run() { + try { + sendNews(city, news); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 195a4ce..1eaccb3 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -1,6 +1,9 @@ package com.fangjia.job.youfang.job; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,13 +34,15 @@ public class TopNewsSendJob implements SimpleJob { @Autowired private NewsService newsService; - + @Autowired private EnterpriseProductUserService enterpriseProductUserService; - + @Autowired private PushMessageService pushMessageService; + private static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(FangjiaConstant.SEND_THREAD_NUM); + @Override public void execute(ShardingContext context) { LOG.info("城市置顶咨询推送开始,context:" + context); @@ -49,20 +54,13 @@ public class TopNewsSendJob implements SimpleJob { for (CityCollect city : cityList) { // cityList已排序好,如果cityName不变,则使用上个newsList if (cityName.equals(city.getCity())) { - try { - sendNews(city, newsList); - } catch (Exception e) { - LOG.error("推送失败!", e); - } + THREAD_POOL.execute(new MyThread(city, newsList)); + } else { // 如果cityName改变,则查询替换cityName和newsList cityName = city.getCity(); newsList = newsService.findTopNews(cityName); - try { - sendNews(city, newsList); - } catch (Exception e) { - LOG.error("推送失败!", e); - } + THREAD_POOL.execute(new MyThread(city, newsList)); } } } @@ -76,7 +74,8 @@ public class TopNewsSendJob implements SimpleJob { if (null == sendList || sendList.isEmpty()) { LOG.info("新闻推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); // 3.发送 - EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); + EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), + new String[] { "push_client_id" }); String pushMsg = n.getContent(); LOG.info(pushMsg); PushMessageParam param = new PushMessageParam(); @@ -94,4 +93,23 @@ public class TopNewsSendJob implements SimpleJob { } + class MyThread extends Thread { + private List news; + private CityCollect city; + + public MyThread(CityCollect city, List news) { + this.news = news; + this.city = city; + } + + @Override + public void run() { + try { + sendNews(city, news); + } catch (Exception e) { + LOG.error("推送失败!", e); + } + } + } + } From c20bbbd7b8956a7d1c8ccbba68f4808635ef2633 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 21 May 2018 13:20:31 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/job/common/base/FangjiaConstant.java | 2 ++ .../java/com/fangjia/job/youfang/job/CityRankingSendJob.java | 4 ++-- .../com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java | 4 ++-- .../main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java index 8c3af6a..ceacd21 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -18,5 +18,7 @@ public class FangjiaConstant { public static final int SUCCESS_RESPONSE_CODE = 200; public static final int SEND_THREAD_NUM = 100; + + public static final int URL_SEND_TYPE = 2; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index a10571f..05c22a4 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -194,8 +194,8 @@ public class CityRankingSendJob implements SimpleJob { PushMessageParam param = new PushMessageParam(); param.setTitle("排行榜提醒"); param.setContent(title); - param.setOperation(1); - param.setOperationPage(""); + param.setOperation(FangjiaConstant.URL_SEND_TYPE); + param.setOperationPage("/views/house/cityDetail.html?city="+city.getCity()); param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); // 记录 diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index da522e8..d400706 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -80,8 +80,8 @@ public class HousingEstateNewsSendJob implements SimpleJob { PushMessageParam param = new PushMessageParam(); param.setTitle(n.getTitle()); param.setContent(pushMsg); - param.setOperation(1); - param.setOperationPage(""); + param.setOperation(FangjiaConstant.URL_SEND_TYPE); + param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); // 4.记录 diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 1eaccb3..b0d5d21 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -81,8 +81,8 @@ public class TopNewsSendJob implements SimpleJob { PushMessageParam param = new PushMessageParam(); param.setTitle(n.getTitle()); param.setContent(pushMsg); - param.setOperation(1); - param.setOperationPage(""); + param.setOperation(FangjiaConstant.URL_SEND_TYPE); + param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); // 4.记录 From f2f396db991790202bd3190d8b5c345cace4cb14 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 21 May 2018 15:24:02 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/youfang/job/CityRankingSendJob.java | 15 ++++++++------- .../job/youfang/job/HousingEstateNewsSendJob.java | 2 +- .../fangjia/job/youfang/job/TopNewsSendJob.java | 2 +- .../java/com/fangjia/job/youfang/po/News.java | 4 ++-- .../youfang/service/CityCollectServiceImpl.java | 3 ++- .../youfang/service/PushMessageServiceImpl.java | 1 + 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 05c22a4..9477265 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -94,7 +94,7 @@ public class CityRankingSendJob implements SimpleJob { // 涨幅前10 topTenList = upList.subList(0, NUM); // 跌幅前10 - bottomTenList = upList.subList(copyList.size() - NUM, copyList.size()); + bottomTenList = upList.subList(upList.size() - NUM, upList.size()); Collections.reverse(bottomTenList);// 涨幅后10名倒序 // 深复制失败,再次访问,用新list做潜力排序 CityNewPriceResultDto resultDto2 = fshApiRemoteService.getAllCitys(token); @@ -134,7 +134,7 @@ public class CityRankingSendJob implements SimpleJob { } /** - * 首次遍历,并返回排名,没有则返回null + * 首次遍历(包含检查),并返回排名,没有则返回null * * @param city * @param list @@ -144,6 +144,7 @@ public class CityRankingSendJob implements SimpleJob { private Integer sendRankings(CityCollect city, List list, byte sendType) { List sendList = citySendLogService.find(city.getUid(), null, sendType); if ((null == sendList || sendList.isEmpty()) && !list.isEmpty()) { + //取排名并发送 for (int i = 0; i <= list.size(); i++) { if (city.getCity().equals(list.get(i).getCity())) { int rankings = i + 1;// 排名 @@ -156,13 +157,13 @@ public class CityRankingSendJob implements SimpleJob { } /** - * 再次遍历,直接使用上次的排名 + * 再次遍历(包含检查),直接使用上次的排名 * * @param city * @param rankings * @param sendType */ - private void sendRankings(CityCollect city, Integer rankings, byte sendType) { + private void sendAndInspect(CityCollect city, Integer rankings, byte sendType) { List sendList = citySendLogService.find(city.getUid(), null, sendType); if ((null == sendList || sendList.isEmpty()) && null != rankings) { baseSend(city, rankings, sendType); @@ -220,9 +221,9 @@ public class CityRankingSendJob implements SimpleJob { @Override public void run() { try { - baseSend(city, topRankings, FangjiaConstant.INCREASE_SEND_TYPE); - sendRankings(city, bottomRankings, FangjiaConstant.INCREASE_SEND_TYPE); - sendRankings(city, potentialRankings, FangjiaConstant.POTENTIAL_SEND_TYPE); + sendAndInspect(city, topRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendAndInspect(city, bottomRankings, FangjiaConstant.INCREASE_SEND_TYPE); + sendAndInspect(city, potentialRankings, FangjiaConstant.POTENTIAL_SEND_TYPE); } catch (Exception e) { LOG.error("推送失败!", e); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index d400706..7dec380 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -75,7 +75,7 @@ public class HousingEstateNewsSendJob implements SimpleJob { // 3.发送 EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); - String pushMsg = n.getContent(); + String pushMsg = n.getIntroduction(); LOG.info(pushMsg); PushMessageParam param = new PushMessageParam(); param.setTitle(n.getTitle()); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index b0d5d21..74063f4 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -76,7 +76,7 @@ public class TopNewsSendJob implements SimpleJob { // 3.发送 EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); - String pushMsg = n.getContent(); + String pushMsg = n.getIntroduction(); LOG.info(pushMsg); PushMessageParam param = new PushMessageParam(); param.setTitle(n.getTitle()); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java index ac60070..79b98ed 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/po/News.java @@ -278,11 +278,11 @@ public class News implements Serializable { this.thumbsUpCount = thumbsUpCount; } - public Date getmDate() { + public Date getMDate() { return mDate; } - public void setmDate(Date mDate) { + public void setMDate(Date mDate) { this.mDate = mDate; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java index fdf8348..921448a 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java @@ -16,7 +16,8 @@ public class CityCollectServiceImpl extends EntityService implement @Override public List findAll() { - return super.list(new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); +// return super.list(new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); + return super.list(new String[] {"uid"},new Object[] {"190075963655061504"},new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java index ebe19a6..f1b5a2b 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java @@ -2,6 +2,7 @@ package com.fangjia.job.youfang.service; import java.util.HashMap; import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; From 6a36c4659dcd66637de4ac86e1bed112dfb1d725 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 21 May 2018 15:25:17 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/service/CityCollectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java index 921448a..069576d 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CityCollectServiceImpl.java @@ -16,8 +16,8 @@ public class CityCollectServiceImpl extends EntityService implement @Override public List findAll() { -// return super.list(new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); - return super.list(new String[] {"uid"},new Object[] {"190075963655061504"},new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); + return super.list(new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); +// return super.list(new String[] {"uid"},new Object[] {"190075963655061504"},new Orders[] { new Orders(ORDER_PARAM, OrderyType.ASC) }); } } From f2ad5cd5cc8427ec594312b35835bf32180af6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Sat, 9 Jun 2018 13:10:30 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/job/HouseRentNoticeJob.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java index b5a35fb..a7df68e 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java @@ -165,13 +165,16 @@ public class HouseRentNoticeJob implements SimpleJob { int days = DateUtilCustom.between(new Date(), nextDay); if (days == 7) { EnterpriseProductUser user = enterpriseProductUserService.getById(Long.parseLong(houseInfo.getUid()), new String[] { "push_client_id" }); + if (user == null) { + return; + } String pushMsg = DateUtils.date2Str(nextDay, "yyyy年MM月dd日") + "是您的到期收租日,又要有现金到账咯,请注意查收。详情请点击查看。"; logger.info(pushMsg); PushMessageParam param = new PushMessageParam(); param.setTitle("收租提醒"); param.setContent(pushMsg); - param.setOperation(1); - param.setOperationPage(""); + param.setOperation(2); + param.setOperationPage("/views/house/detail.html?houseId="+houseInfo.getId()); param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); } @@ -195,8 +198,8 @@ public class HouseRentNoticeJob implements SimpleJob { PushMessageParam param = new PushMessageParam(); param.setTitle("收租提醒"); param.setContent(pushMsg); - param.setOperation(1); - param.setOperationPage(""); + param.setOperation(2); + param.setOperationPage("/views/house/detail.html?houseId="+house.getId()); param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); } From 9ff884e5f6f05509d509b56a9e8e73a711560da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 21 May 2018 17:02:21 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E5=87=BA=E7=A7=9F=E6=8F=90=E9=86=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java index a7df68e..89be3a3 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HouseRentNoticeJob.java @@ -82,7 +82,8 @@ public class HouseRentNoticeJob implements SimpleJob { @Override public void run() { try { - if("出租".equals(h.getLiveStatus())) { + int days = DateUtilCustom.between(new Date(), h.getLeaseEndDate()); + if("出租".equals(h.getLiveStatus()) && days >= 0) { rentPush(h); rentEndPush(h); } From 10fb91163a555cd276f44d76f30fd5241f31930e Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 11:48:28 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/youfang/dto/CityStatInfoDto.java | 25 ++++++++++++++++--- .../job/youfang/job/CityRankingSendJob.java | 8 ++++-- .../youfang/job/HousingEstateNewsSendJob.java | 8 ++++-- .../job/youfang/job/TopNewsSendJob.java | 8 ++++-- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java index 7dc5b20..8bb886e 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/dto/CityStatInfoDto.java @@ -17,6 +17,26 @@ public class CityStatInfoDto { // 是否关注该城市(定位城市数据页面使用) private boolean follow; + public CityStatInfoDto() { + + } + + public CityStatInfoDto(String id, String city, Integer statDate, Integer avgPrice, Integer index, Double markup, + Double rentRate, Double yoyMarkup, int rangeLevel, Integer downChance, boolean follow) { + super(); + this.id = id; + this.city = city; + this.statDate = statDate; + this.avgPrice = avgPrice; + this.index = index; + this.markup = markup; + this.rentRate = rentRate; + this.yoyMarkup = yoyMarkup; + this.rangeLevel = rangeLevel; + this.downChance = downChance; + this.follow = follow; + } + public boolean isFollow() { return follow; } @@ -125,9 +145,8 @@ public class CityStatInfoDto { // 为实现深copy @Override public CityStatInfoDto clone() throws CloneNotSupportedException { - CityStatInfoDto dto = null; - dto = (CityStatInfoDto) super.clone(); - return dto; + return new CityStatInfoDto(this.id, this.city, this.statDate, this.avgPrice, this.index, this.markup, + this.rentRate, this.yoyMarkup, this.rangeLevel, this.downChance, this.follow); } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 9477265..4227705 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -197,8 +197,12 @@ public class CityRankingSendJob implements SimpleJob { param.setContent(title); param.setOperation(FangjiaConstant.URL_SEND_TYPE); param.setOperationPage("/views/house/cityDetail.html?city="+city.getCity()); - param.setPushClientId(user.getPushClientId()); - pushMessageService.push(param); + if (null != user) { + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); + } else { + LOG.info("PushClientId查询不到,uid:" + city.getUid()); + } // 记录 citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 7dec380..f5efcc2 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -82,8 +82,12 @@ public class HousingEstateNewsSendJob implements SimpleJob { param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); - param.setPushClientId(user.getPushClientId()); - pushMessageService.push(param); + if (null != user) { + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); + } else { + LOG.info("PushClientId查询不到,uid:" + city.getUid()); + } // 4.记录 citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 74063f4..e5c8154 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -83,8 +83,12 @@ public class TopNewsSendJob implements SimpleJob { param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); - param.setPushClientId(user.getPushClientId()); - pushMessageService.push(param); + if (null != user) { + param.setPushClientId(user.getPushClientId()); + pushMessageService.push(param); + } else { + LOG.info("PushClientId查询不到,uid:" + city.getUid()); + } // 4.记录 citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.NEWS_SEND_TYPE); } From ab70031e32f7c126bdc3fce9f085ec38591c2941 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 11:55:32 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/job/youfang/job/CityRankingSendJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 4227705..8b37d95 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -145,7 +145,7 @@ public class CityRankingSendJob implements SimpleJob { List sendList = citySendLogService.find(city.getUid(), null, sendType); if ((null == sendList || sendList.isEmpty()) && !list.isEmpty()) { //取排名并发送 - for (int i = 0; i <= list.size(); i++) { + for (int i = 0; i < list.size(); i++) { if (city.getCity().equals(list.get(i).getCity())) { int rankings = i + 1;// 排名 baseSend(city, rankings, sendType); From 1564db01b63ea06c84128efa01f9003566777f12 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 13:49:12 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/job/youfang/service/NewsServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 b5cefe1..2bbafe0 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 @@ -14,8 +14,6 @@ public class NewsServiceImpl extends EntityService implements NewsService private static final int ON_LINE_STATUS = 1; - private static final String NEWS_TYPE = "新闻"; - private static final String HOUSING_ESTATE_TYPE = "推荐小区"; @Override @@ -32,8 +30,8 @@ public class NewsServiceImpl extends EntityService implements NewsService @Override public List findTopNews(String city) { - return super.list(new String[] { "status", "top_status", "type", "city" }, - new Object[] { ON_LINE_STATUS, TOP_STATUS, NEWS_TYPE, city }); + return super.list(new String[] { "status", "top_status", "city" }, + new Object[] { ON_LINE_STATUS, TOP_STATUS, city }); } @Override From 59b202ecdaca156970c244b7ff3ff106fc35a11d Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 15:28:41 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/base/FangjiaConstant.java | 6 +++-- .../youfang/job/HousingEstateNewsSendJob.java | 3 ++- .../job/youfang/job/TopNewsSendJob.java | 24 ++++++++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java index ceacd21..9e4fc78 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -16,9 +16,11 @@ public class FangjiaConstant { public static final byte POTENTIAL_SEND_TYPE = 4; public static final int SUCCESS_RESPONSE_CODE = 200; - + public static final int SEND_THREAD_NUM = 100; - + + public static final int OPEN_APP_TYPE = 0; + public static final int URL_SEND_TYPE = 2; } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index f5efcc2..0dd021a 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -81,7 +81,8 @@ public class HousingEstateNewsSendJob implements SimpleJob { param.setTitle(n.getTitle()); param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); - param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendCity() + "®ion=" + + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); if (null != user) { param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index e5c8154..9bf9f5a 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -82,7 +82,29 @@ public class TopNewsSendJob implements SimpleJob { param.setTitle(n.getTitle()); param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); - param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + switch (n.getType()) { + case "专题": + param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + break; + case "新闻": + param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + break; + case "推荐城市": + param.setOperationPage("/views/house/cityDetail.html?city=" + n.getCity()); + break; + case "投票": + param.setOperation(FangjiaConstant.OPEN_APP_TYPE); + break; + case "活动": + param.setOperation(FangjiaConstant.OPEN_APP_TYPE); + break; + case "推荐小区": + param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendCity() + "®ion=" + + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); + break; + default: + param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + } if (null != user) { param.setPushClientId(user.getPushClientId()); pushMessageService.push(param); From f2ab9e90a73fda8db55a6f9ee213ad221e64fde9 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 15:46:36 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/job/HousingEstateNewsSendJob.java | 2 +- .../java/com/fangjia/job/youfang/job/TopNewsSendJob.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 0dd021a..00c3166 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -81,7 +81,7 @@ public class HousingEstateNewsSendJob implements SimpleJob { param.setTitle(n.getTitle()); param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); - param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendCity() + "®ion=" + param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendDistrictCity() + "®ion=" + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); if (null != user) { param.setPushClientId(user.getPushClientId()); diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 9bf9f5a..6a1e2e9 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; +import com.fangjia.job.common.util.JsonUtils; import com.fangjia.job.youfang.document.CitySendLog; import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.CityCollect; @@ -88,6 +89,7 @@ public class TopNewsSendJob implements SimpleJob { break; case "新闻": param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); + param.setUserId(city.getUid()); break; case "推荐城市": param.setOperationPage("/views/house/cityDetail.html?city=" + n.getCity()); @@ -99,14 +101,16 @@ public class TopNewsSendJob implements SimpleJob { param.setOperation(FangjiaConstant.OPEN_APP_TYPE); break; case "推荐小区": - param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendCity() + "®ion=" - + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); + param.setOperationPage( + "/views/district/detail.html?city=" + n.getRecommendDistrictCity() + "®ion=" + + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); break; default: param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); } if (null != user) { param.setPushClientId(user.getPushClientId()); + //LOG.info("param:" + JsonUtils.toJson(param)); pushMessageService.push(param); } else { LOG.info("PushClientId查询不到,uid:" + city.getUid()); From ebc3ce1b84e15d67ca945bd9f640a602b2448af5 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 16:23:42 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=8E=BB=E6=97=A0=E6=95=88=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 6a1e2e9..4b058a9 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; -import com.fangjia.job.common.util.JsonUtils; import com.fangjia.job.youfang.document.CitySendLog; import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.CityCollect; From a3b305c036ca2b68e140c5eea8a99f2b88c0b4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Tue, 22 May 2018 16:34:08 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E6=8E=92=E5=90=8D=E8=B5=84=E4=BA=A7=E7=9A=84=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/job/youfang/job/UserAssetsLevelJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/UserAssetsLevelJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/UserAssetsLevelJob.java index 1999f65..0b8cfeb 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/UserAssetsLevelJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/UserAssetsLevelJob.java @@ -90,7 +90,7 @@ public class UserAssetsLevelJob implements SimpleJob { } level.setName(name); Long totalMoney = houseInfoService.queryUserManagerHouseTotalPrice(1L, user.getId()+""); - level.setAssets(DataUtil.getDoubleRound(2, totalMoney / 10000D)); + level.setAssets(DataUtil.getDoubleRound(0, totalMoney / 10000D)); mongoTemplate.save(level); } } From 45a267e878fd8297dd3f00c6fc44e61876edd509 Mon Sep 17 00:00:00 2001 From: bayi Date: Wed, 23 May 2018 12:01:13 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=BA=94=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/common/base/FangjiaConstant.java | 2 ++ .../job/youfang/document/CitySendLog.java | 8 ++++- .../job/youfang/job/CityRankingSendJob.java | 32 +++++++++++++------ .../youfang/job/HousingEstateNewsSendJob.java | 24 ++++++++++---- .../job/youfang/job/TopNewsSendJob.java | 24 ++++++++++---- .../youfang/service/CitySendLogService.java | 4 ++- .../service/CitySendLogServiceImpl.java | 23 ++++++++++++- .../youfang/service/PushMessageService.java | 6 ++++ .../service/PushMessageServiceImpl.java | 27 ++++++++++++++-- 9 files changed, 124 insertions(+), 26 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java index 9e4fc78..c5f8ab6 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/base/FangjiaConstant.java @@ -23,4 +23,6 @@ public class FangjiaConstant { public static final int URL_SEND_TYPE = 2; + public static final int SEND_ERROR_LIMIT = 3; //失败尝试的上限 + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java index 8bf25be..b80eb07 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/CitySendLog.java @@ -17,7 +17,7 @@ public class CitySendLog { private long uid; - private long newsId; + private Long newsId; private Date sendTime; @@ -26,4 +26,10 @@ public class CitySendLog { */ private byte sendType; + // 推送次数 + private int sendNum; + + // 推送状态 + private Boolean sendStatus; + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java index 8b37d95..c67a670 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/CityRankingSendJob.java @@ -144,11 +144,11 @@ public class CityRankingSendJob implements SimpleJob { private Integer sendRankings(CityCollect city, List list, byte sendType) { List sendList = citySendLogService.find(city.getUid(), null, sendType); if ((null == sendList || sendList.isEmpty()) && !list.isEmpty()) { - //取排名并发送 + // 取排名并发送 for (int i = 0; i < list.size(); i++) { if (city.getCity().equals(list.get(i).getCity())) { int rankings = i + 1;// 排名 - baseSend(city, rankings, sendType); + baseSend(city, rankings, sendType, null); return rankings; } } @@ -164,9 +164,14 @@ public class CityRankingSendJob implements SimpleJob { * @param sendType */ private void sendAndInspect(CityCollect city, Integer rankings, byte sendType) { - List sendList = citySendLogService.find(city.getUid(), null, sendType); - if ((null == sendList || sendList.isEmpty()) && null != rankings) { - baseSend(city, rankings, sendType); + if (null != rankings) { + List sendList = citySendLogService.find(city.getUid(), null, sendType); + if (null == sendList || sendList.isEmpty()) { + baseSend(city, rankings, sendType, null);// 首次 + } else if (!sendList.get(0).getSendStatus() + && sendList.get(0).getSendNum() < FangjiaConstant.SEND_ERROR_LIMIT) { + baseSend(city, rankings, sendType, sendList.get(0)); + } } } @@ -177,7 +182,7 @@ public class CityRankingSendJob implements SimpleJob { * @param rankings * @param sendType */ - private void baseSend(CityCollect city, Integer rankings, byte sendType) { + private void baseSend(CityCollect city, Integer rankings, byte sendType, CitySendLog log) { String title = null; if (FangjiaConstant.INCREASE_SEND_TYPE == sendType) { title = city.getCity() + ",全国城市涨幅排名第" + rankings + "位"; @@ -196,15 +201,24 @@ public class CityRankingSendJob implements SimpleJob { param.setTitle("排行榜提醒"); param.setContent(title); param.setOperation(FangjiaConstant.URL_SEND_TYPE); - param.setOperationPage("/views/house/cityDetail.html?city="+city.getCity()); + param.setOperationPage("/views/house/cityDetail.html?city=" + city.getCity()); + boolean result = false; + int sendNum = 1; if (null != user) { param.setPushClientId(user.getPushClientId()); - pushMessageService.push(param); + result = pushMessageService.pushByReturn(param); } else { LOG.info("PushClientId查询不到,uid:" + city.getUid()); + sendNum = FangjiaConstant.SEND_ERROR_LIMIT; } // 记录 - citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType); + if (null == log) { + citySendLogService.save(city.getCity(), city.getUid(), 0L, sendType, result, sendNum); + } else { + log.setSendStatus(result); + log.setSendNum(log.getSendNum() + 1); + citySendLogService.update(log); + } } class MyThread extends Thread { diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java index 00c3166..9db54c2 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/HousingEstateNewsSendJob.java @@ -70,7 +70,8 @@ public class HousingEstateNewsSendJob implements SimpleJob { List sendList = citySendLogService.find(city.getUid(), n.getId(), FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); // 未推送过的推送 - if (null == sendList || sendList.isEmpty()) { + if (null == sendList || sendList.isEmpty() || (!sendList.get(0).getSendStatus() + && sendList.get(0).getSendNum() < FangjiaConstant.SEND_ERROR_LIMIT)) { LOG.info("小区推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); // 3.发送 EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), @@ -81,17 +82,28 @@ public class HousingEstateNewsSendJob implements SimpleJob { param.setTitle(n.getTitle()); param.setContent(pushMsg); param.setOperation(FangjiaConstant.URL_SEND_TYPE); - param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendDistrictCity() + "®ion=" - + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); + param.setOperationPage("/views/district/detail.html?city=" + n.getRecommendDistrictCity() + + "®ion=" + n.getRecommendDistrictRegion() + "&name=" + n.getRecommendDistrictName()); + + boolean result = false; + int sendNum = 1; if (null != user) { param.setPushClientId(user.getPushClientId()); - pushMessageService.push(param); + result = pushMessageService.pushByReturn(param); } else { LOG.info("PushClientId查询不到,uid:" + city.getUid()); + sendNum = FangjiaConstant.SEND_ERROR_LIMIT;// 不可推送的,次数直接置为3次,避免再次推送 } // 4.记录 - citySendLogService.save(city.getCity(), city.getUid(), n.getId(), - FangjiaConstant.HOUSING_ESTATE_SEND_TYPE); + if (null == sendList || sendList.isEmpty()) { + citySendLogService.save(city.getCity(), city.getUid(), n.getId(), + FangjiaConstant.HOUSING_ESTATE_SEND_TYPE, result, sendNum); + } else { + CitySendLog log = sendList.get(0); + log.setSendStatus(result); + log.setSendNum(log.getSendNum() + 1); + citySendLogService.update(log); + } } } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java index 4b058a9..025a8aa 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/TopNewsSendJob.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import com.fangjia.job.common.base.FangjiaConstant; +import com.fangjia.job.common.util.JsonUtils; import com.fangjia.job.youfang.document.CitySendLog; import com.fangjia.job.youfang.param.PushMessageParam; import com.fangjia.job.youfang.po.CityCollect; @@ -70,14 +71,14 @@ public class TopNewsSendJob implements SimpleJob { for (News n : newsList) { List sendList = citySendLogService.find(city.getUid(), n.getId(), FangjiaConstant.NEWS_SEND_TYPE); - // 未推送过的推送 - if (null == sendList || sendList.isEmpty()) { + // 未推送过的推送或推送失败次数少于三次 + if (null == sendList || sendList.isEmpty() + || (!sendList.get(0).getSendStatus()&&sendList.get(0).getSendNum() < FangjiaConstant.SEND_ERROR_LIMIT)) { LOG.info("新闻推送开始。。。uid:" + city.getUid() + ",newsId:" + n.getId()); // 3.发送 EnterpriseProductUser user = enterpriseProductUserService.getById(city.getUid(), new String[] { "push_client_id" }); String pushMsg = n.getIntroduction(); - LOG.info(pushMsg); PushMessageParam param = new PushMessageParam(); param.setTitle(n.getTitle()); param.setContent(pushMsg); @@ -107,15 +108,26 @@ public class TopNewsSendJob implements SimpleJob { default: param.setOperationPage("/views/news/newsDetail.html?newsId=" + n.getId()); } + boolean result = false; + int sendNum = 1; if (null != user) { param.setPushClientId(user.getPushClientId()); - //LOG.info("param:" + JsonUtils.toJson(param)); - pushMessageService.push(param); + LOG.info("param:" + JsonUtils.toJson(param)); + result = pushMessageService.pushByReturn(param); } else { LOG.info("PushClientId查询不到,uid:" + city.getUid()); + sendNum = FangjiaConstant.SEND_ERROR_LIMIT;// 不可推送的,次数直接置为3次,避免再次推送 } // 4.记录 - citySendLogService.save(city.getCity(), city.getUid(), n.getId(), FangjiaConstant.NEWS_SEND_TYPE); + if (null == sendList || sendList.isEmpty()) { + citySendLogService.save(city.getCity(), city.getUid(), n.getId(), + FangjiaConstant.NEWS_SEND_TYPE, result, sendNum); + } else { + CitySendLog log = sendList.get(0); + log.setSendStatus(result); + log.setSendNum(log.getSendNum() + 1); + citySendLogService.update(log); + } } } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java index acf0683..ba06c37 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogService.java @@ -6,7 +6,9 @@ import com.fangjia.job.youfang.document.CitySendLog; public interface CitySendLogService { - void save(String city, Long uid, Long nId, byte sendType); + CitySendLog save(String city, Long uid, Long nId, byte sendType, Boolean sendStatus, int sendNum); List find(long uid, Long newsId, Byte sendType); + + void update(CitySendLog log); } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java index ebd1c94..4b689de 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; import com.fangjia.job.youfang.document.CitySendLog; @@ -19,14 +20,17 @@ public class CitySendLogServiceImpl implements CitySendLogService { private MongoTemplate mongoTemplate; @Override - public void save(String city, Long uid, Long nId, byte sendType) { + public CitySendLog save(String city, Long uid, Long nId, byte sendType, Boolean sendStatus, int sendNum) { CitySendLog log = new CitySendLog(); log.setCity(city); log.setNewsId(nId); log.setSendTime(new Date()); log.setSendType(sendType); log.setUid(uid); + log.setSendStatus(sendStatus); + log.setSendNum(sendNum); mongoTemplate.save(log); + return log; } @Override @@ -52,4 +56,21 @@ public class CitySendLogServiceImpl implements CitySendLogService { c.add(Calendar.MONTH, -1); return c.getTime(); } + + @SuppressWarnings("static-access") + @Override + public void update(CitySendLog log) { + if (null != log.getNewsId()) { + mongoTemplate.updateFirst( + Query.query(Criteria.where("uid").is(log.getUid()).and("newsId").is(log.getNewsId())), + Update.update("sendNum", log.getSendNum()).update("sendStatus", log.getSendStatus()), + CitySendLog.class); + } else { + mongoTemplate.updateFirst( + Query.query(Criteria.where("uid").is(log.getUid()).and("sendTime").is(log.getSendTime()) + .and("sendType").is(log.getSendType())), + Update.update("sendNum", log.getSendNum()).update("sendStatus", log.getSendStatus()), + CitySendLog.class); + } + } } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java index 402e279..1bf7fd1 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageService.java @@ -10,4 +10,10 @@ public interface PushMessageService { */ void push(PushMessageParam param); + /** + * 推送消息 + * @param param + */ + boolean pushByReturn(PushMessageParam param); + } diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java index f1b5a2b..0ca4ed2 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/PushMessageServiceImpl.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.cxytiandi.jdbc.EntityService; +import com.fangjia.job.common.base.Response; import com.fangjia.job.common.util.DingDingMessageUtil; import com.fangjia.job.common.util.RestApiCallUtils; import com.fangjia.job.youfang.param.PushMessageParam; @@ -18,10 +19,10 @@ import com.fangjia.job.youfang.remote.FshApiRemoteService; public class PushMessageServiceImpl extends EntityService implements PushMessageService { private Logger logger = LoggerFactory.getLogger(PushMessageServiceImpl.class); - + @Value("${fsh.url}") private String fshApiUrl; - + @Override public void push(PushMessageParam param) { FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, fshApiUrl); @@ -41,4 +42,26 @@ public class PushMessageServiceImpl extends EntityService implement } } + @Override + public boolean pushByReturn(PushMessageParam param) { + FshApiRemoteService fshApiRemoteService = RestApiCallUtils.getRestClient(FshApiRemoteService.class, fshApiUrl); + boolean result = false; + try { + Map params = new HashMap(); + params.put("token", "goojia123456"); + params.put("title", param.getTitle()); + params.put("content", param.getContent()); + params.put("operation", param.getOperation()); + params.put("operationPage", param.getOperationPage()); + params.put("pushClientId", param.getPushClientId()); + params.put("userId", param.getUserId()); + Response res = fshApiRemoteService.pushMessage(params); + result = res.getStatus(); + } catch (Exception e) { + logger.error("消息推送异常:", e); + DingDingMessageUtil.sendTextMessage("消息推送异常:" + e.getMessage()); + } + return result; + } + } From 32dc1c475fbb0efc3afdef25dd02c5ff60a0312c Mon Sep 17 00:00:00 2001 From: bayi Date: Wed, 23 May 2018 14:58:53 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/job/youfang/service/CitySendLogServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java index 4b689de..d7ef36c 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java +++ b/fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/service/CitySendLogServiceImpl.java @@ -57,19 +57,18 @@ public class CitySendLogServiceImpl implements CitySendLogService { return c.getTime(); } - @SuppressWarnings("static-access") @Override public void update(CitySendLog log) { if (null != log.getNewsId()) { mongoTemplate.updateFirst( Query.query(Criteria.where("uid").is(log.getUid()).and("newsId").is(log.getNewsId())), - Update.update("sendNum", log.getSendNum()).update("sendStatus", log.getSendStatus()), + Update.update("sendNum", log.getSendNum()).set("sendStatus", log.getSendStatus()), CitySendLog.class); } else { mongoTemplate.updateFirst( Query.query(Criteria.where("uid").is(log.getUid()).and("sendTime").is(log.getSendTime()) .and("sendType").is(log.getSendType())), - Update.update("sendNum", log.getSendNum()).update("sendStatus", log.getSendStatus()), + Update.update("sendNum", log.getSendNum()).set("sendStatus", log.getSendStatus()), CitySendLog.class); } } From 522357c2f6e9ac99924f393cdeedf9af176eb666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Wed, 23 May 2018 17:46:25 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/applicationContext.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 e61f113..d734984 100644 --- a/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml +++ b/fangjia-job/fangjia-job-youfang/src/main/resources/applicationContext.xml @@ -1,4 +1,4 @@ - + @@ -154,7 +154,7 @@ @@ -163,7 +163,7 @@