wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 更新待办模板取消配置模板 ID

Browse Source
This commit is contained in:
wangli 2023-12-12 19:56:03 +08:00
parent ce8f294235
commit 130ecd8c06
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeConf.java
View File

@ -32,7 +32,7 @@ public class BpmnNoticeConf implements Serializable {
* 待办的配置
*/
@Valid
@NotNull(message = "待办模板不能为空")
// @NotNull(message = "待办模板不能为空")
private BpmnPendingProperty pending;
/**

4
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnPendingProperty.java
View File

@ -6,8 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
/**
* 待办
*
@ -23,7 +21,7 @@ public class BpmnPendingProperty {
* 待办消息模板 ID
*/
@ApiModelProperty(value = "待办消息模板 ID")
@NotBlank(message = "待办消息模板 ID 不能为空")
// @NotBlank(message = "待办消息模板 ID 不能为空")
private String pendingMessageId;
/**

18
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java
View File

@ -327,14 +327,16 @@ public final class BpmnJsonConverterUtil {
noticeConfigElement.addChildElement(noticeMessage);
// 代办消息模板配置
ExtensionElement pendingMessage = new ExtensionElement();
pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID);
ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute();
pendingMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
pendingMessageAttribute.setValue(noticeConf.getPending().getPendingMessageId());
pendingMessage.addAttribute(pendingMessageAttribute);
pendingMessage.setElementText(noticeConf.getPending().getViewJson());
noticeConfigElement.addChildElement(pendingMessage);
if (Objects.nonNull(noticeConf.getPending())) {
ExtensionElement pendingMessage = new ExtensionElement();
pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID);
ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute();
pendingMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
pendingMessageAttribute.setValue(noticeConf.getPending().getPendingMessageId());
pendingMessage.addAttribute(pendingMessageAttribute);
pendingMessage.setElementText(noticeConf.getPending().getViewJson());
noticeConfigElement.addChildElement(pendingMessage);
}
// 短信模板配置
if (Objects.nonNull(noticeConf.getSms())) {

11
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
View File

@ -138,10 +138,13 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
if (log.isDebugEnabled()) {
log.debug("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
}
MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING,
event,
collectionVariable(event));
sendMessageQueue(dto, PROCESS_PUSH_PENDING);
if (Objects.nonNull(event.getNoticeConfig().getPending())) {
MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING,
event,
collectionVariable(event));
sendMessageQueue(dto, PROCESS_PUSH_PENDING);
}
if (log.isDebugEnabled()) {
log.debug("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
}