|
@@ -1,4 +1,4 @@
|
|
|
-package com.keao.edu.auth.service.impl;
|
|
|
+package com.keao.edu.common.service.impl;
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -17,10 +17,6 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.keao.edu.auth.api.client.SysUserFeignService;
|
|
|
-import com.keao.edu.auth.api.entity.SysUser;
|
|
|
-import com.keao.edu.auth.service.SysMessageConfigService;
|
|
|
-import com.keao.edu.auth.service.SysMessageService;
|
|
|
import com.keao.edu.common.dal.BaseDAO;
|
|
|
import com.keao.edu.common.dao.SysMessageDao;
|
|
|
import com.keao.edu.common.entity.Mapper;
|
|
@@ -31,10 +27,8 @@ import com.keao.edu.common.enums.MessageTypeEnum;
|
|
|
import com.keao.edu.common.enums.SendStatusEnum;
|
|
|
import com.keao.edu.common.exception.BizException;
|
|
|
import com.keao.edu.common.redis.service.RedisCache;
|
|
|
-import com.keao.edu.common.service.impl.BaseServiceImpl;
|
|
|
-import com.keao.edu.im.api.client.ImFeignService;
|
|
|
-import com.keao.edu.im.api.entity.ImPrivateMessage;
|
|
|
-import com.keao.edu.im.api.entity.ImTxtMessage;
|
|
|
+import com.keao.edu.common.service.SysMessageConfigService;
|
|
|
+import com.keao.edu.common.service.SysMessageService;
|
|
|
import com.keao.edu.thirdparty.message.MessageSenderPlugin;
|
|
|
import com.keao.edu.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.keao.edu.thirdparty.message.provider.YimeiSmsPlugin;
|
|
@@ -55,12 +49,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
private MessageSenderPluginContext messageSenderPluginContext;
|
|
|
|
|
|
@Autowired
|
|
|
- private SysUserFeignService sysUserFeignService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private ImFeignService imFeignService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
private RedisCache<String, Object> redisCache;
|
|
|
|
|
|
// 验证码有效期
|
|
@@ -107,12 +95,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
receiver = entry.getValue();
|
|
|
|
|
|
message = new SysMessage();
|
|
|
- if (userId == null) {
|
|
|
- SysUser user = sysUserFeignService.queryUserByMobile(receiver);
|
|
|
- if (user != null) {
|
|
|
- userId = user.getId();
|
|
|
- }
|
|
|
- }
|
|
|
message.setUserId(userId);
|
|
|
message.setContent(content);
|
|
|
message.setCreateOn(date);
|
|
@@ -179,61 +161,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void batchSendImMessage(MessageTypeEnum type, String senderId,String extra, String[] targetIds, String url, Object... args) {
|
|
|
- SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
|
|
|
- if (messageConfig == null) {
|
|
|
- throw new BizException("消息类型错误");
|
|
|
- }else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
|
|
|
- return;
|
|
|
- }
|
|
|
- String content = MessageFormatter.arrayFormat(messageConfig.getContent(), args);
|
|
|
- if(StringUtils.isNotEmpty(url)){
|
|
|
- content += url;
|
|
|
- }
|
|
|
- ImPrivateMessage privateMessage = new ImPrivateMessage();
|
|
|
- privateMessage.setObjectName("RC:TxtMsg");
|
|
|
- privateMessage.setTargetId(targetIds);
|
|
|
- privateMessage.setSenderId(senderId);
|
|
|
- privateMessage.setContent(new ImTxtMessage(content,extra));
|
|
|
- imFeignService.privateSend(privateMessage);
|
|
|
- }
|
|
|
-
|
|
|
- /*@Override
|
|
|
- public void batchSendImPlayMidiMessage(String senderId,String roomId, String content) {
|
|
|
- ImGroupMessage groupMessage = new ImGroupMessage();
|
|
|
- privateMessage.setObjectName("DY:PlayMidiMessage");
|
|
|
- groupMessage.setTargetId(roomId.split(","));
|
|
|
- groupMessage.setSenderId(senderId);
|
|
|
- groupMessage.setContent(new ImPlayMidiMessage(content,null));
|
|
|
- groupMessage.setType("DY:PlayMidiMessage");
|
|
|
- imFeignService.privateSendCustom(groupMessage);
|
|
|
- }*/
|
|
|
-
|
|
|
- @Override
|
|
|
- public void sendPrivateMessage(String studentId, String content) {
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if(sysUser == null){
|
|
|
- throw new BizException("用户信息获取失败");
|
|
|
- }
|
|
|
- ImPrivateMessage privateMessage = new ImPrivateMessage();
|
|
|
- privateMessage.setObjectName("RC:TxtMsg");
|
|
|
- privateMessage.setTargetId(studentId.split(","));
|
|
|
- privateMessage.setSenderId(sysUser.getId().toString());
|
|
|
- privateMessage.setContent(new ImTxtMessage(content,null));
|
|
|
- imFeignService.privateSend(privateMessage);
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void sendNoAuthPrivateMessage(String sender, String receiver, String content) {
|
|
|
- ImPrivateMessage privateMessage = new ImPrivateMessage();
|
|
|
- privateMessage.setObjectName("RC:TxtMsg");
|
|
|
- privateMessage.setTargetId(receiver.split(","));
|
|
|
- privateMessage.setSenderId(sender);
|
|
|
- privateMessage.setContent(new ImTxtMessage(content,null));
|
|
|
- imFeignService.privateSend(privateMessage);
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
public void batchDelMessage(String ids) {
|
|
|
sysMessageDao.batchDelMessage(ids);
|
|
|
}
|