diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/MessageUrgeListFeign.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/MessageUrgeListFeign.java index 296ed81..1b87037 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/MessageUrgeListFeign.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/MessageUrgeListFeign.java @@ -1,7 +1,11 @@ package com.yxt.messagecenter.api.messageurgeList; +import com.yxt.common.core.result.ResultBean; import com.yxt.messagecenter.api.message.MessageFeignFallback; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @description: @@ -14,4 +18,8 @@ import org.springframework.cloud.openfeign.FeignClient; path = "v1/MessageUrgeList", fallback = MessageUrgeListFeignFallback.class) public interface MessageUrgeListFeign { + + @ApiOperation("人工催办") + @PostMapping(value = "/manualReminder") + ResultBean manualReminder(@RequestBody UrgeDto dto); } diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/UrgeDto.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/UrgeDto.java new file mode 100644 index 0000000..c3c745d --- /dev/null +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/UrgeDto.java @@ -0,0 +1,19 @@ +package com.yxt.messagecenter.api.messageurgeList; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/13 + **/ +@Data +public class UrgeDto implements Dto { + private static final long serialVersionUID = 6869859199655790013L; + @ApiModelProperty("流程定义id") + private String proDefId; + @ApiModelProperty("流程实例id") + private String proInstId; +} diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListRest.java index 5bfbbfb..d06453c 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListRest.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListRest.java @@ -1,9 +1,25 @@ package com.yxt.messagecenter.biz.messageurgeList; +import com.yxt.common.core.result.ResultBean; +import com.yxt.messagecenter.api.messageurgeList.MessageUrgeListFeign; +import com.yxt.messagecenter.api.messageurgeList.UrgeDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @description: * @author: dimengzhe * @date: 2023/9/9 **/ -public class MessageUrgeListRest { +@RestController +@RequestMapping("v1/MessageUrgeList") +public class MessageUrgeListRest implements MessageUrgeListFeign { + + @Autowired + private MessageUrgeListService messageUrgeListService; + @Override + public ResultBean manualReminder(UrgeDto dto) { + return messageUrgeListService.manualReminder(dto); + } } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java index 96977d1..3baa7a9 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java @@ -1,14 +1,23 @@ package com.yxt.messagecenter.biz.messageurgeList; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; +import com.yxt.messagecenter.api.message.PushMessageQuery; import com.yxt.messagecenter.api.messagetype.MessageType; import com.yxt.messagecenter.api.messageurgeList.MessageListDto; import com.yxt.messagecenter.api.messageurgeList.MessageUrgeList; +import com.yxt.messagecenter.api.messageurgeList.UrgeDto; +import com.yxt.messagecenter.biz.message.MessageService; import com.yxt.messagecenter.biz.messagetype.MessageTypeMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -17,6 +26,13 @@ import org.springframework.stereotype.Service; @Service public class MessageUrgeListService extends MybatisBaseService { + @Autowired + private FlowFeign flowFeign; + @Autowired + private MessageService messageService; + @Autowired + private MessageUrgeListService messageUrgeListService; + ResultBean saveMessage(MessageListDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -25,4 +41,32 @@ public class MessageUrgeListService extends MybatisBaseService resultBean = flowFeign.getMessageReminder(proDefId, proInstId); + if (resultBean.getData() != null) { + FlowableMessageVo flowableMessageVo = resultBean.getData(); + MessageListDto messageListDto = new MessageListDto(); + BeanUtil.copyProperties(flowableMessageVo, messageListDto); + //=================================================== + List recipientSidList = Arrays.asList(flowableMessageVo.getAssignee().split(",")); + PushMessageQuery pushMessageQuery = new PushMessageQuery(); + pushMessageQuery.setReceivedSids(recipientSidList); + pushMessageQuery.setModuleName("审批中心"); + pushMessageQuery.setMsgContent("您有待办理的审批,请登录平台及时处理"); + pushMessageQuery.setApp_type("2"); + pushMessageQuery.setMsgTitle("审批催办提醒"); + // 消息推送 + ResultBean msgSidResultBean = messageService.pushUrgeNoUriMessage(pushMessageQuery); + String msgSid = msgSidResultBean.getData(); + messageListDto.setMsgSid(msgSid); + messageListDto.setType(2); + messageUrgeListService.saveMessage(messageListDto); + } + + return null; + } } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java index 3776d8a..33d54f1 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java @@ -66,6 +66,7 @@ public class ScheduledMessageService { ResultBean msgSidResultBean = messageService.pushUrgeNoUriMessage(pushMessageQuery); String msgSid = msgSidResultBean.getData(); messageListDto.setMsgSid(msgSid); + messageListDto.setType(1); messageUrgeListService.saveMessage(messageListDto); } }