wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-2010' into pre

Browse Source
This commit is contained in:
yanglin 2024-02-28 15:31:00 +08:00
commit aa4379038c
2 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -107,6 +107,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -231,7 +232,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
.last("LIMIT " + request.getFetchLimit()));
resultPage.addAnalysis("fetchedTemplateMessages", templateMessages);
}
resultPage.addAnalysis("templateCodes", templateCodes);
resultPage.addAnalysis("templateCodes", new HashSet<>(templateCodes));
resultPage.addAnalysis("personId", request.getPersonId());
resultPage.addAnalysis("operator", operator);
resultPage.addAnalysis("ouId", request.getOuId());

70
start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
View File

@ -1,13 +1,14 @@
package cn.axzo.msg.center.message.service;
import cn.axzo.msg.center.MsgCenterApplication;
import cn.axzo.msg.center.message.domain.param.PendingMessagePushParam;
import cn.axzo.msg.center.service.pending.request.PendingMessageIterateRequest;
import cn.axzo.msg.center.service.pending.response.PendingMessageIterateResponse;
import cn.azxo.framework.common.model.Page;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
/**
* @author yanglin
@ -19,59 +20,18 @@ class PendingMessageNewServiceTest {
@Test
void foo() {
String str = "{\n" +
" \"bizCategory\": \"OTHER\",\n" +
" \"bizCode\": \"200000500324319\",\n" +
" \"bizExtParams\": \"{\\\"teamLeaderName\\\":\\\"罗顺江\\\"}\",\n" +
" \"executor\": [\n" +
" {\n" +
" \"id\": 22373,\n" +
" \"identity\": {\n" +
" \"id\": 0,\n" +
" \"type\": \"NOT_SUPPORT\",\n" +
" \"valid\": true\n" +
" },\n" +
" \"name\": \"阮新宇\",\n" +
" \"valid\": true\n" +
" },\n" +
" {\n" +
" \"id\": 3549,\n" +
" \"identity\": {\n" +
" \"id\": 0,\n" +
" \"type\": \"NOT_SUPPORT\",\n" +
" \"valid\": true\n" +
" },\n" +
" \"name\": \"张苏秦\",\n" +
" \"valid\": true\n" +
" },\n" +
" {\n" +
" \"id\": 3470,\n" +
" \"identity\": {\n" +
" \"id\": 0,\n" +
" \"type\": \"NOT_SUPPORT\",\n" +
" \"valid\": true\n" +
" },\n" +
" \"name\": \"皮俊\",\n" +
" \"valid\": true\n" +
" }\n" +
" ],\n" +
" \"orgType\": \"PROJECT\",\n" +
" \"ouId\": 5425,\n" +
" \"promoter\": {\n" +
" \"id\": 59242,\n" +
" \"identity\": {\n" +
" \"type\": \"NOT_SUPPORT\",\n" +
" \"valid\": false\n" +
" },\n" +
" \"name\": \"罗顺江\",\n" +
" \"valid\": false\n" +
" },\n" +
" \"routerParams\": \"{\\\"ouId\\\":\\\"5425\\\",\\\"acceptanceNo\\\":\\\"500015004\\\",\\\"status\\\":\\\"5\\\",\\\"workspaceId\\\":\\\"272\\\"}\",\n" +
" \"templateCode\": \"52ae3e8ec48242e485e9389202e102ce\",\n" +
" \"workspaceId\": 272\n" +
"}";
PendingMessagePushParam param = JSON.parseObject(str, PendingMessagePushParam.class);
pendingMessageNewService.push(param);
String jsonStr = "{\"templateCode\":\"f40eef2ee88e4a80a699389d009a1561\",\"page\":1,\"pageSize\":500}";
PendingMessageIterateRequest request = JSON.parseObject(jsonStr, PendingMessageIterateRequest.class);
Page<PendingMessageIterateResponse> iterate = pendingMessageNewService.iterate(request);
int i = 1;
int size = iterate.getList().size();
while (iterate.getList().size() >= 500) {
request.setPage(request.getPage() + 1);
iterate = pendingMessageNewService.iterate(request);
size += iterate.getList().size();
i++;
}
System.out.println();
}
}