From 667c8305c2a1cbc49cc5a2eea1e176cd93333fa1 Mon Sep 17 00:00:00 2001 From: bayi Date: Thu, 17 May 2018 16:45:46 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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 - - } - }