瀏覽代碼

Merge remote-tracking branch 'origin/master'

Joburgess 5 年之前
父節點
當前提交
a654a1239b

+ 7 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -29,7 +29,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args);
 
 	/**
-	 * 推送im文本消息
+	 * 推送im文本消息,包换调整链接
 	 * @param senderId
 	 * @param messageType
 	 * @return
@@ -137,4 +137,10 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	
 	public List<SysMessage> queryUserInRecentMinList(String mobile, int recentMin, MessageSendMode type);
 
+	/**
+	 * 发送私聊消息
+	 * @param studentId
+	 * @param content
+	 */
+    void sendPrivateMessage(String studentId, String content);
 }

+ 15 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -203,6 +203,21 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@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.setIsIncludeSender(1);
+		privateMessage.setContent(new ImTxtMessage(content,null));
+		imFeignService.privateSend(privateMessage);
+	}
+
+	@Override
 	@Async
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
 			Integer readStatus, String memo, String group,String jpushType) {

+ 13 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/ImController.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -27,6 +28,8 @@ public class ImController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
+    private SysMessageService sysMessageService;
+    @Autowired
     private TeacherService teacherService;
 
     @ApiOperation(value = "获取教务所有聊天群组")
@@ -90,4 +93,14 @@ public class ImController extends BaseController {
         return succeed(classGroupService.getUserInfoWithUserId(groupId,userId));
     }
 
+    @ApiOperation(value = "发送私聊消息")
+    @GetMapping("/sendPrivateMessage")
+    public Object sendPrivateMessage(String targetId,String content) {
+        if (StringUtils.isEmpty(targetId) || StringUtils.isEmpty(content)) {
+            return failed("参数校验错误");
+        }
+        sysMessageService.sendPrivateMessage(targetId,content);
+        return succeed();
+    }
+
 }