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

Merge branch 'feature/REQ-2010' into test

Browse Source
This commit is contained in:
yanglin 2024-02-27 10:38:33 +08:00
commit 344054f4e6
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/AnalysisPage.java
View File

@ -1,13 +1,14 @@
package cn.axzo.msg.center.service.pending.response; package cn.axzo.msg.center.service.pending.response;
import cn.azxo.framework.common.model.Page; import cn.azxo.framework.common.model.Page;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.TreeMap;
/** /**
* @author yanglin * @author yanglin
@ -16,7 +17,7 @@ import java.util.List;
@Getter @Getter
public class AnalysisPage<T> extends Page<T> { public class AnalysisPage<T> extends Page<T> {
private JSONObject analysis = new JSONObject(); private TreeMap<String, Object> analysis = new TreeMap<>();
private boolean enableAnalysis; private boolean enableAnalysis;
public AnalysisPage() { public AnalysisPage() {
@ -45,7 +46,7 @@ public class AnalysisPage<T> extends Page<T> {
return copy; return copy;
} }
public void addAnalysis(JSONObject analysis) { public void addAnalysis(Map<String, Object> analysis) {
if (enableAnalysis) { if (enableAnalysis) {
this.analysis.putAll(analysis); this.analysis.putAll(analysis);
} }

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

@ -18,9 +18,58 @@ class PendingMessageNewServiceTest {
private final PendingMessageNewService pendingMessageNewService; private final PendingMessageNewService pendingMessageNewService;
@Test @Test
@Commit
void foo() { void foo() {
String str = "{\"bizCategory\":\"OTHER\",\"bizCode\":\"200000700321808\",\"bizExtParams\":\"{\\\"teamLeaderName\\\":\\\"袁均清\\\"}\",\"executor\":[{\"id\":16562,\"identity\":{\"id\":0,\"type\":\"NOT_SUPPORT\",\"valid\":true},\"name\":\"马元猛\",\"valid\":true},{\"id\":16563,\"identity\":{\"id\":0,\"type\":\"NOT_SUPPORT\",\"valid\":true},\"name\":\"辛宁\",\"valid\":true}],\"orgType\":\"PROJECT\",\"ouId\":6066,\"promoter\":{\"id\":16444,\"identity\":{\"id\":2004889,\"type\":\"PRACTITIONER\",\"valid\":true},\"name\":\"袁均清\",\"valid\":true},\"routerParams\":\"{\\\"acceptanceNo\\\":\\\"700013411\\\",\\\"status\\\":\\\"1\\\"}\",\"templateCode\":\"52ae3e8ec48242e485e9389202e102ce\",\"workspaceId\":375}"; 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); PendingMessagePushParam param = JSON.parseObject(str, PendingMessagePushParam.class);
pendingMessageNewService.push(param); pendingMessageNewService.push(param);
} }