diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index def6219a..f295702c 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -106,6 +106,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collectors; /** @@ -878,6 +879,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { } private Long getPractitionOuId(PersonDTO executor, Long workspaceId, Long ouId) { + Supplier executorOuIdFun = () -> ouId == null ? 0L : ouId; // 从业人员单位处理 if (IdentityTypeEnum.PRACTITIONER == executor.getIdentity().getType()) { if(null == ouId){ @@ -892,13 +894,13 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { } }else{ // 业务传递了从业人员ouId - return ouId; + return executorOuIdFun.get(); } }else{ // 非从业人员处理 - return 0L; + return executorOuIdFun.get(); } - return 0L; + return executorOuIdFun.get(); } private void buildTemplateInfo(PendingMessageRecord record, MessageTemplateDTO msgTemplate, String bizParam) { diff --git a/start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java b/start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java index 1a34524f..cf2dcee8 100644 --- a/start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java +++ b/start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java @@ -1,13 +1,7 @@ package cn.axzo.msg.center.message.service; import cn.axzo.msg.center.MsgCenterApplication; -import cn.axzo.msg.center.service.pending.request.CompletePendingBySubCodeRequest; -import cn.axzo.msg.center.service.pending.request.CompletePendingMessageByIdRequest; -import cn.axzo.msg.center.service.pending.request.CompletePendingMessageRequest; -import cn.axzo.msg.center.service.pending.request.PendingMessagePageRequest; -import cn.axzo.msg.center.service.pending.request.SetHideRequest; -import cn.axzo.msg.center.service.pending.response.PendingMessageResponse; -import cn.azxo.framework.common.model.Page; +import cn.axzo.msg.center.message.domain.param.PendingMessagePushParam; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; @@ -15,10 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.Commit; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; - /** * @author yanglin */ @@ -30,21 +20,9 @@ class PendingMessageNewServiceTest { @Test @Commit void foo() { - String jsonStr = "{\"msgId\":null,\"subBizCode\":\"202401301728000000030\",\"hideSeconds\":null}\n"; - SetHideRequest req = JSON.parseObject(jsonStr, SetHideRequest.class); - Boolean b = pendingMessageNewService.setHide(req); - System.out.println(); - //SetHideRequest req = new SetHideRequest(); - //req.setSubBizCode("08345cb9-669a-11ee-8d91-02550a00001f"); - //pendingMessageNewService.setHide(req); - //String jsonStr = "{\"appTerminalType\":\"CMS_WEB_PC\",\"groupNodeCode\":\"\",\"identityId\":1593,\"identityType\":\"PRACTITIONER\",\"msgState\":\"HAS_BEEN_SENT\",\"ouId\":5812,\"page\":1,\"pageSize\":10,\"personId\":2849,\"roleCategory\":\"EXECUTOR\",\"terminalType\":\"WEB\"}"; - //PendingMessagePageRequest request = JSON.parseObject(jsonStr, PendingMessagePageRequest.class); - //Page pendingMessageResponsePage = pendingMessageNewService.pageQuery(request); - //System.out.println(); - //pendingMessageNewService.complete("650d3eaa3d3a4064b34a64b7b1c8dffb"); - //pendingMessageNewService.completeById(CompletePendingMessageByIdRequest.builder().id(20578L).build()); - //pendingMessageNewService.completeByTemplateCodeBizCode(CompletePendingMessageRequest.builder().templateCode("75047e6339484e81bcce244d56fb2363").bizCode("DFX202311231600002").build()); - //pendingMessageNewService.completeByTemplateCodeSubBizCode(CompletePendingBySubCodeRequest.builder().bizCode("0818e560-669a-11ee-8d91-02550a00001f").subBizCode("08345cb9-669a-11ee-8d91-02550a00001f").templateCode("a97760e573674658b6b351e2f3a6e379").build()); + 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}"; + PendingMessagePushParam param = JSON.parseObject(str, PendingMessagePushParam.class); + pendingMessageNewService.push(param); } } \ No newline at end of file