|
|
@@ -1,6 +1,5 @@
|
|
|
package com.uas.ps.message.service.impl;
|
|
|
|
|
|
-
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.account.entity.User;
|
|
|
import com.uas.account.entity.UserView;
|
|
|
@@ -198,7 +197,7 @@ public class MessageServiceImpl implements MessageService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Message readMessage(String consumer) {
|
|
|
+ public List<Message> readMessage(String consumer) {
|
|
|
if (StringUtils.isEmpty(consumer)) {
|
|
|
throw new ParameterMissingException("接收人信息为空,无法阅读消息");
|
|
|
}
|
|
|
@@ -212,23 +211,30 @@ public class MessageServiceImpl implements MessageService {
|
|
|
if (StringUtils.isEmpty(messageId)) {
|
|
|
throw new ParameterMissingException("消息id为空,请重新确认消息信息");
|
|
|
} else {
|
|
|
- Message message = messageDao.findOne(Long.valueOf(String.valueOf(messageId)));
|
|
|
- if (message == null) {
|
|
|
- throw new IllegalOperatorException("消息不存在,请重新确认消息信息");
|
|
|
- }
|
|
|
- if (receiverUu == null || StringUtils.isEmpty(String.valueOf(receiverEnuu)) || receiverEnuu == null
|
|
|
- || StringUtils.isEmpty(String.valueOf(receiverUu))) {
|
|
|
- throw new ParameterMissingException("用户信息为空,无法读取消息");
|
|
|
- }
|
|
|
- if (!Long.valueOf(String.valueOf(receiverEnuu)).equals(message.getReceiverEnuu())
|
|
|
- || !Long.valueOf(String.valueOf(receiverUu)).equals(message.getReceiverUu())) {
|
|
|
- throw new IllegalOperatorException("此消息不属于当前用户,请重新确认后读取");
|
|
|
- }
|
|
|
- if (Constant.YES.equals(message.getIsRead())) {
|
|
|
- throw new IllegalOperatorException("消息已阅读");
|
|
|
+ String[] messageIds = String.valueOf(messageId).split(SplitChar.COMMA);
|
|
|
+ List<Message> messages = new ArrayList<>();
|
|
|
+
|
|
|
+ for (String id : messageIds) {
|
|
|
+ Message message = messageDao.findOne(Long.valueOf(String.valueOf(messageId)));
|
|
|
+ if (message == null) {
|
|
|
+ throw new IllegalOperatorException("消息不存在,请重新确认消息信息");
|
|
|
+ }
|
|
|
+ if (receiverUu == null || StringUtils.isEmpty(String.valueOf(receiverEnuu)) || receiverEnuu == null
|
|
|
+ || StringUtils.isEmpty(String.valueOf(receiverUu))) {
|
|
|
+ throw new ParameterMissingException("用户信息为空,无法读取消息");
|
|
|
+ }
|
|
|
+ if (!Long.valueOf(String.valueOf(receiverEnuu)).equals(message.getReceiverEnuu())
|
|
|
+ || !Long.valueOf(String.valueOf(receiverUu)).equals(message.getReceiverUu())) {
|
|
|
+ throw new IllegalOperatorException("此消息不属于当前用户,请重新确认后读取");
|
|
|
+ }
|
|
|
+ if (Constant.YES.equals(message.getIsRead())) {
|
|
|
+ throw new IllegalOperatorException("消息已阅读");
|
|
|
+ }
|
|
|
+ message.setIsRead(Constant.YES);
|
|
|
+ messages.add(message);
|
|
|
}
|
|
|
- message.setIsRead(Constant.YES);
|
|
|
- return messageDao.save(message);
|
|
|
+
|
|
|
+ return messageDao.save(messages);
|
|
|
}
|
|
|
}
|
|
|
|