Merge branch 'refs/heads/feature/REQ-2699' into dev

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetPendingTodosRequest.java

@@ -37,7 +37,9 @@ public class GetPendingTodosRequest {
     private TerminalTypeEnum terminalType;
 
     public int determineLimit() {
-        return Math.max(Math.min(limit, 5000), 10);
+        if (limit <= 0)
+            return 10;
+        return Math.min(limit, 5000);
     }
 
 }

start/src/test/java/cn/axzo/msg/center/api/MessageAPIV4Test.java

@@ -0,0 +1,31 @@
+package cn.axzo.msg.center.api;
+
+import cn.axzo.msg.center.MsgCenterApplication;
+import cn.axzo.msg.center.api.request.v4.MessageSendRequestV4;
+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;
+import org.springframework.transaction.annotation.Transactional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author yanglin
+ */
+@SpringBootTest(classes = MsgCenterApplication.class)
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+class MessageAPIV4Test {
+
+    private final MessageAPIV4 messageAPIV4;
+
+    @Test @Transactional @Commit
+    void exec() {
+        String json = "{\"eventMappingCode\":\"gaia_projectComplete_closeOrCancel_workpoint\",\"sendBasicInfo\":{\"bizCode\":\"421\",\"bizExtParams\":{\"reason\":\"记工单关联的部分工程已完结\",\"count\":\"1 单\",\"type\":\"系统自动撤销记工单\"},\"receivers\":[{\"id\":2810}],\"receiversOrgType\":\"PROJECT\",\"receiversOuId\":6458,\"receiversWorkspaceId\":326,\"routerParams\":{\"projectId\":421,\"workspaceId\":326}},\"templates\":[{\"channel\":\"NOTIFICATION\",\"templateCodes\":[\"75d88ddae7914c7089b67d944357fa1c\"]}]}";
+        MessageSendRequestV4 request = JSON.parseObject(json, MessageSendRequestV4.class);;
+        messageAPIV4.send(request);
+    }
+
+}