Commit bbb0ab04bc6bfff31a5dc797a3e681d8f616dd97
1 parent
d8aed3a3
联调
Showing
5 changed files
with
12 additions
and
4 deletions
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java
| 1 | package cn.fw.hestia.domain.vo; | 1 | package cn.fw.hestia.domain.vo; |
| 2 | 2 | ||
| 3 | import cn.fw.common.page.BasePageQuery; | 3 | import cn.fw.common.page.BasePageQuery; |
| 4 | -import cn.fw.common.web.annotation.LoginContextField; | ||
| 5 | import lombok.Data; | 4 | import lombok.Data; |
| 6 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 7 | import lombok.ToString; | 6 | import lombok.ToString; |
| @@ -16,7 +15,5 @@ import lombok.ToString; | @@ -16,7 +15,5 @@ import lombok.ToString; | ||
| 16 | @ToString(callSuper = true) | 15 | @ToString(callSuper = true) |
| 17 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
| 18 | public class HistoryQuery extends BasePageQuery { | 17 | public class HistoryQuery extends BasePageQuery { |
| 19 | - | ||
| 20 | - @LoginContextField(LoginContextField.Name.USER_ID) | ||
| 21 | private Long memberId; | 18 | private Long memberId; |
| 22 | } | 19 | } |
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java
| @@ -34,6 +34,10 @@ public class MessageHistoryVO { | @@ -34,6 +34,10 @@ public class MessageHistoryVO { | ||
| 34 | */ | 34 | */ |
| 35 | private String remark; | 35 | private String remark; |
| 36 | /** | 36 | /** |
| 37 | + * 小程序页面路径 | ||
| 38 | + */ | ||
| 39 | + private String pagePath; | ||
| 40 | + /** | ||
| 37 | * 是否已读 | 41 | * 是否已读 |
| 38 | */ | 42 | */ |
| 39 | private Boolean readz; | 43 | private Boolean readz; |
| @@ -54,6 +58,10 @@ public class MessageHistoryVO { | @@ -54,6 +58,10 @@ public class MessageHistoryVO { | ||
| 54 | vo.setReadz(history.getReadz()); | 58 | vo.setReadz(history.getReadz()); |
| 55 | vo.setRemark(history.getRemark()); | 59 | vo.setRemark(history.getRemark()); |
| 56 | vo.setMessageTime(history.getCreateTime()); | 60 | vo.setMessageTime(history.getCreateTime()); |
| 61 | + if (history.getPagePath() != null && history.getPagePath().trim().length() > 0) { | ||
| 62 | + String st = history.getPagePath() + "?sceneToken=" + history.getId(); | ||
| 63 | + vo.setPagePath(st); | ||
| 64 | + } | ||
| 57 | return vo; | 65 | return vo; |
| 58 | } | 66 | } |
| 59 | } | 67 | } |
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java
| @@ -40,4 +40,5 @@ public class CommonController { | @@ -40,4 +40,5 @@ public class CommonController { | ||
| 40 | public Message<String> manualSend(@NotNull(message = "sceneToken不能为空") final Long sceneToken) { | 40 | public Message<String> manualSend(@NotNull(message = "sceneToken不能为空") final Long sceneToken) { |
| 41 | return success(messageCenterBizService.manualSend(sceneToken)); | 41 | return success(messageCenterBizService.manualSend(sceneToken)); |
| 42 | } | 42 | } |
| 43 | + | ||
| 43 | } | 44 | } |
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java
| @@ -55,7 +55,8 @@ public class MessageCenterController { | @@ -55,7 +55,8 @@ public class MessageCenterController { | ||
| 55 | 55 | ||
| 56 | @GetMapping("/query/history") | 56 | @GetMapping("/query/history") |
| 57 | @ControllerMethod("查询消息历史记录") | 57 | @ControllerMethod("查询消息历史记录") |
| 58 | - public Message<AppPage<MessageHistoryVO>> queryHistory(HistoryQuery query) { | 58 | + public Message<AppPage<MessageHistoryVO>> queryHistory(@CurrentUser PassportAuthBean user, HistoryQuery query) { |
| 59 | + query.setMemberId(user.getUserId()); | ||
| 59 | return success(messageCenterBizService.queryHistory(query)); | 60 | return success(messageCenterBizService.queryHistory(query)); |
| 60 | } | 61 | } |
| 61 | } | 62 | } |
fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java
| @@ -47,6 +47,7 @@ public class SendMessageTask { | @@ -47,6 +47,7 @@ public class SendMessageTask { | ||
| 47 | .eq(MessageHistory::getYn, Boolean.TRUE) | 47 | .eq(MessageHistory::getYn, Boolean.TRUE) |
| 48 | .lt(MessageHistory::getFrequency, MAX_FREQUENCY) | 48 | .lt(MessageHistory::getFrequency, MAX_FREQUENCY) |
| 49 | .lt(MessageHistory::getSendTime, new Date()) | 49 | .lt(MessageHistory::getSendTime, new Date()) |
| 50 | + .last("limit 1000") | ||
| 50 | ); | 51 | ); |
| 51 | if (CollectionUtils.isEmpty(list)) { | 52 | if (CollectionUtils.isEmpty(list)) { |
| 52 | return; | 53 | return; |