优化
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<MessageUrgeListMapper, MessageUrgeList> {
|
||||
|
||||
@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<MessageUrgeListMa
|
||||
baseMapper.insert(messageUrgeList);
|
||||
return rb.success();
|
||||
}
|
||||
|
||||
public ResultBean manualReminder(UrgeDto dto) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
String proDefId = dto.getProDefId();
|
||||
String proInstId = dto.getProInstId();
|
||||
ResultBean<FlowableMessageVo> resultBean = flowFeign.getMessageReminder(proDefId, proInstId);
|
||||
if (resultBean.getData() != null) {
|
||||
FlowableMessageVo flowableMessageVo = resultBean.getData();
|
||||
MessageListDto messageListDto = new MessageListDto();
|
||||
BeanUtil.copyProperties(flowableMessageVo, messageListDto);
|
||||
//===================================================
|
||||
List<String> recipientSidList = Arrays.asList(flowableMessageVo.getAssignee().split(","));
|
||||
PushMessageQuery pushMessageQuery = new PushMessageQuery();
|
||||
pushMessageQuery.setReceivedSids(recipientSidList);
|
||||
pushMessageQuery.setModuleName("审批中心");
|
||||
pushMessageQuery.setMsgContent("您有待办理的审批,请登录平台及时处理");
|
||||
pushMessageQuery.setApp_type("2");
|
||||
pushMessageQuery.setMsgTitle("审批催办提醒");
|
||||
// 消息推送
|
||||
ResultBean<String> msgSidResultBean = messageService.pushUrgeNoUriMessage(pushMessageQuery);
|
||||
String msgSid = msgSidResultBean.getData();
|
||||
messageListDto.setMsgSid(msgSid);
|
||||
messageListDto.setType(2);
|
||||
messageUrgeListService.saveMessage(messageListDto);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +66,7 @@ public class ScheduledMessageService {
|
||||
ResultBean<String> msgSidResultBean = messageService.pushUrgeNoUriMessage(pushMessageQuery);
|
||||
String msgSid = msgSidResultBean.getData();
|
||||
messageListDto.setMsgSid(msgSid);
|
||||
messageListDto.setType(1);
|
||||
messageUrgeListService.saveMessage(messageListDto);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user