valhalla / fw-hestia

Commit bbb0ab04bc6bfff31a5dc797a3e681d8f616dd97

Authored by 张志伟
1 parent d8aed3a3

:zap: 联调

Inline Side-by-side
Showing 5 changed files with 12 additions and 4 deletions
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java
  View file @bbb0ab0
1 1 package cn.fw.hestia.domain.vo;
2 2  
3 3 import cn.fw.common.page.BasePageQuery;
4   -import cn.fw.common.web.annotation.LoginContextField;
5 4 import lombok.Data;
6 5 import lombok.EqualsAndHashCode;
7 6 import lombok.ToString;
... ... @@ -16,7 +15,5 @@ import lombok.ToString;
16 15 @ToString(callSuper = true)
17 16 @EqualsAndHashCode(callSuper = true)
18 17 public class HistoryQuery extends BasePageQuery {
19   -
20   - @LoginContextField(LoginContextField.Name.USER_ID)
21 18 private Long memberId;
22 19 }
... ...
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java
  View file @bbb0ab0
... ... @@ -34,6 +34,10 @@ public class MessageHistoryVO {
34 34 */
35 35 private String remark;
36 36 /**
  37 + * 小程序页面路径
  38 + */
  39 + private String pagePath;
  40 + /**
37 41 * 是否已读
38 42 */
39 43 private Boolean readz;
... ... @@ -54,6 +58,10 @@ public class MessageHistoryVO {
54 58 vo.setReadz(history.getReadz());
55 59 vo.setRemark(history.getRemark());
56 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 65 return vo;
58 66 }
59 67 }
... ...
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java
  View file @bbb0ab0
... ... @@ -40,4 +40,5 @@ public class CommonController {
40 40 public Message<String> manualSend(@NotNull(message = "sceneToken不能为空") final Long sceneToken) {
41 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
  View file @bbb0ab0
... ... @@ -55,7 +55,8 @@ public class MessageCenterController {
55 55  
56 56 @GetMapping("/query/history")
57 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 60 return success(messageCenterBizService.queryHistory(query));
60 61 }
61 62 }
... ...
fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java
  View file @bbb0ab0
... ... @@ -47,6 +47,7 @@ public class SendMessageTask {
47 47 .eq(MessageHistory::getYn, Boolean.TRUE)
48 48 .lt(MessageHistory::getFrequency, MAX_FREQUENCY)
49 49 .lt(MessageHistory::getSendTime, new Date())
  50 + .last("limit 1000")
50 51 );
51 52 if (CollectionUtils.isEmpty(list)) {
52 53 return;
... ...