Commit afb99988 authored by yanzg's avatar yanzg

接口文档的支持

parent a6a46f08
...@@ -48,7 +48,7 @@ public class YzgMqConsumer { ...@@ -48,7 +48,7 @@ public class YzgMqConsumer {
public void commentDataCreate(String json, Message message, Channel channel) { public void commentDataCreate(String json, Message message, Channel channel) {
try { try {
MessageVo req = JsonHelper.deserialize(json, MessageVo.class); MessageVo req = JsonHelper.deserialize(json, MessageVo.class);
mqService.message(req); mqService.message(req, true);
} catch (CodeException ex) { } catch (CodeException ex) {
Log.error(YzgMqConsumer.class, ex); Log.error(YzgMqConsumer.class, ex);
} catch (Exception ex) { } catch (Exception ex) {
......
...@@ -27,7 +27,7 @@ public interface MessageService { ...@@ -27,7 +27,7 @@ public interface MessageService {
* @param req 发送消息 * @param req 发送消息
* @return 发送结果 * @return 发送结果
*/ */
String send(MessageVo req); String send(MessageVo req, boolean now);
/** /**
* 发送下条消息 * 发送下条消息
......
...@@ -30,6 +30,15 @@ public interface MqService { ...@@ -30,6 +30,15 @@ public interface MqService {
*/ */
String message(MessageVo req); String message(MessageVo req);
/**
* 发送消息
*
* @param req 需要发送的消息
* @param now 是否立即发送
* @return 消息编号,但是没有任何意义,发送成功会更改
*/
String message(MessageVo req, boolean now);
/** /**
* 发送错误消息 * 发送错误消息
* *
......
...@@ -65,14 +65,14 @@ public class MessageServiceImpl implements MessageService { ...@@ -65,14 +65,14 @@ public class MessageServiceImpl implements MessageService {
* @return 发送结果 * @return 发送结果
*/ */
@Override @Override
public String send(MessageVo req) { public String send(MessageVo req, boolean now) {
if (!StringHelper.isEmpty(req.getHandleTime())) { if (!StringHelper.isEmpty(req.getHandleTime())) {
long dedTime = DateHelper.getDateTime(req.getHandleTime()).getTime() - System.currentTimeMillis(); long dedTime = DateHelper.getDateTime(req.getHandleTime()).getTime() - System.currentTimeMillis();
req.setDedTime(dedTime); req.setDedTime(dedTime);
req.setDedTimeDefine(false); req.setDedTimeDefine(false);
// return messageDao.save(req); // return messageDao.save(req);
} }
return sendContent(StringHelper.EMPTY, req); return sendContent(StringHelper.EMPTY, req, now);
} }
/** /**
...@@ -82,18 +82,19 @@ public class MessageServiceImpl implements MessageService { ...@@ -82,18 +82,19 @@ public class MessageServiceImpl implements MessageService {
*/ */
@Override @Override
public String nextSend(MessageVo req) { public String nextSend(MessageVo req) {
return sendContent(req.getMessageId(), req); return sendContent(req.getMessageId(), req, true);
} }
/** /**
* 发送消息队列内容 * 发送消息队列内容
* *
* @param messageId 需要发送的消息队列 * @param messageId 需要发送的消息队列
* @param req * @param req 发送消息内容
* @param now 是否立即发送
* @return * @return
*/ */
private String sendContent(String messageId, MessageVo req) { private String sendContent(String messageId, MessageVo req, boolean now) {
if (req.getDedTime() > 0 && !req.isDedTimeDefine()) { if (req.getDedTime() > 0 && !req.isDedTimeDefine() && !now) {
// 延迟队列处理 // 延迟队列处理
req.setMessageId(messageId); req.setMessageId(messageId);
return yzgMqConsumer.sendDelay(req); return yzgMqConsumer.sendDelay(req);
......
...@@ -66,9 +66,21 @@ public class MqServiceImpl implements MqService { ...@@ -66,9 +66,21 @@ public class MqServiceImpl implements MqService {
*/ */
@Override @Override
public String message(MessageVo req) { public String message(MessageVo req) {
return this.message(req, false);
}
/**
* 发送消息
*
* @param req 需要发送的消息
* @param now 是否立即发送
* @return 消息编号,但是没有任何意义,发送成功会更改
*/
@Override
public String message(MessageVo req, boolean now) {
this.init(); this.init();
req.check(); req.check();
return messageService.send(req); return messageService.send(req, now);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment