From 10fb91163a555cd276f44d76f30fd5241f31930e Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 22 May 2018 11:48:28 +0800 Subject: [PATCH 1/6] =?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 2/6] =?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 3/6] =?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 4/6] =?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 5/6] =?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 6/6] =?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;