|
@@ -1,7 +1,10 @@
|
|
|
package com.ym.controller;
|
|
|
|
|
|
+import com.ym.mec.common.entity.ImBaseMessage;
|
|
|
import com.ym.mec.common.entity.ImGroupMessage;
|
|
|
+import com.ym.mec.common.entity.ImNoticeMessage;
|
|
|
import com.ym.mec.common.entity.ImTxtMessage;
|
|
|
+import com.ym.pojo.NoticeMessage;
|
|
|
import com.ym.service.GroupService;
|
|
|
import com.ym.service.MessageService;
|
|
|
import io.rong.messages.TxtMessage;
|
|
@@ -12,6 +15,7 @@ import io.rong.models.message.GroupMessage;
|
|
|
import io.rong.models.message.MentionMessage;
|
|
|
import io.rong.models.message.PrivateMessage;
|
|
|
import io.rong.models.message.RecallMessage;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -35,9 +39,15 @@ public class GroupController{
|
|
|
@RequestMapping(value = "/send", method = RequestMethod.POST)
|
|
|
public Object send(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
|
|
|
GroupMessage groupMessage = new GroupMessage();
|
|
|
- ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
|
|
|
- TxtMessage txtMessage = new TxtMessage(content.getContent(),content.getExtra());
|
|
|
- groupMessage.setContent(txtMessage);
|
|
|
+ ImTxtMessage imTxtMessage = (ImTxtMessage) imGroupMessage.getContent();
|
|
|
+ String objectName = imGroupMessage.getObjectName();
|
|
|
+ if("DY:NoticeMsg".equals(objectName)){
|
|
|
+ NoticeMessage noticeMessage = new NoticeMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
|
|
|
+ groupMessage.setContent(noticeMessage);
|
|
|
+ }else {
|
|
|
+ TxtMessage txtMessage = new TxtMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
|
|
|
+ groupMessage.setContent(txtMessage);
|
|
|
+ }
|
|
|
groupMessage.setTargetId(imGroupMessage.getTargetId());
|
|
|
groupMessage.setSenderId(imGroupMessage.getSenderId());
|
|
|
groupMessage.setObjectName(imGroupMessage.getObjectName());
|