Browse Source

修复问题

master
dimengzhe 3 years ago
parent
commit
5ff8611344
  1. 3
      message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java
  2. 9
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java

3
message-center-api/src/main/java/com/yxt/messagecenter/api/message/AppMessageDto.java

@ -65,4 +65,7 @@ public class AppMessageDto implements Dto {
@ApiModelProperty("推送的消息打开的action(APP),推送参数对应class_name") @ApiModelProperty("推送的消息打开的action(APP),推送参数对应class_name")
private String msgTargetUri; private String msgTargetUri;
@ApiModelProperty("推送taskId")
private String taskId;
} }

9
message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java

@ -167,7 +167,11 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
if (StringUtils.isBlank(dto.getSid())) { // 新增 if (StringUtils.isBlank(dto.getSid())) { // 新增
Message message = new Message(); Message message = new Message();
dto.fillEntity(message); dto.fillEntity(message);
message.setSid(UUID.randomUUID().toString()); if (StringUtils.isNotBlank(dto.getTaskId())) {
message.setSid(dto.getTaskId());
}else{
message.setSid(UUID.randomUUID().toString());
}
Boolean flag = save(message); Boolean flag = save(message);
if (flag) { if (flag) {
return new ResultBean().success().setMsg("保存成功").setData(message.getSid()); return new ResultBean().success().setMsg("保存成功").setData(message.getSid());
@ -204,6 +208,9 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
} }
} }
} }
if (StringUtils.isNotBlank(dto.getTaskId())) {
messageDto.setTaskId(dto.getTaskId());
}
messageDto.setMsgTitle(msgTitle); messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(msgContent); messageDto.setMsgContent(msgContent);
messageDto.setMsgSource("审批中心"); messageDto.setMsgSource("审批中心");

Loading…
Cancel
Save