diff --git a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java index 7572151..21bd408 100644 --- a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java +++ b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java @@ -1,7 +1,6 @@ package cn.fw.hestia.domain.vo; import cn.fw.common.page.BasePageQuery; -import cn.fw.common.web.annotation.LoginContextField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +15,5 @@ import lombok.ToString; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class HistoryQuery extends BasePageQuery { - - @LoginContextField(LoginContextField.Name.USER_ID) private Long memberId; } diff --git a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java index 0054d08..7f2b81f 100644 --- a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java +++ b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java @@ -34,6 +34,10 @@ public class MessageHistoryVO { */ private String remark; /** + * 小程序页面路径 + */ + private String pagePath; + /** * 是否已读 */ private Boolean readz; @@ -54,6 +58,10 @@ public class MessageHistoryVO { vo.setReadz(history.getReadz()); vo.setRemark(history.getRemark()); vo.setMessageTime(history.getCreateTime()); + if (history.getPagePath() != null && history.getPagePath().trim().length() > 0) { + String st = history.getPagePath() + "?sceneToken=" + history.getId(); + vo.setPagePath(st); + } return vo; } } diff --git a/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java b/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java index 1cd132e..75e0f1b 100644 --- a/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java +++ b/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java @@ -40,4 +40,5 @@ public class CommonController { public Message manualSend(@NotNull(message = "sceneToken不能为空") final Long sceneToken) { return success(messageCenterBizService.manualSend(sceneToken)); } + } diff --git a/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java b/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java index 243fd79..5b0d5b0 100644 --- a/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java +++ b/fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java @@ -55,7 +55,8 @@ public class MessageCenterController { @GetMapping("/query/history") @ControllerMethod("查询消息历史记录") - public Message> queryHistory(HistoryQuery query) { + public Message> queryHistory(@CurrentUser PassportAuthBean user, HistoryQuery query) { + query.setMemberId(user.getUserId()); return success(messageCenterBizService.queryHistory(query)); } } diff --git a/fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java b/fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java index df43401..fe924e2 100644 --- a/fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java +++ b/fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java @@ -47,6 +47,7 @@ public class SendMessageTask { .eq(MessageHistory::getYn, Boolean.TRUE) .lt(MessageHistory::getFrequency, MAX_FREQUENCY) .lt(MessageHistory::getSendTime, new Date()) + .last("limit 1000") ); if (CollectionUtils.isEmpty(list)) { return;