zouxuan пре 5 година
родитељ
комит
7e09820997

+ 4 - 4
mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -1,7 +1,8 @@
 package com.ym.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.ym.mec.common.entity.*;
+import com.ym.mec.common.entity.ImGroupMessage;
+import com.ym.mec.common.entity.ImPrivateMessage;
+import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.pojo.CustomMessage;
 import com.ym.service.MessageService;
 import io.rong.messages.TxtMessage;
@@ -9,7 +10,6 @@ import io.rong.models.message.GroupMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +43,7 @@ public class PrivateController {
     public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
         ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
-        CustomMessage customMessage = new CustomMessage(JSON.parseObject(content.getContent()),content.getExtra());
+        CustomMessage customMessage = new CustomMessage(content.getContent(),content.getExtra());
         customMessage.setTYPE(imGroupMessage.getType());
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(imGroupMessage.getTargetId());

+ 3 - 2
mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -59,13 +59,14 @@ public class RoomController{
             throw new BizException("用户信息获取失败");
         }
 //        roomService.sendImPlayMidiMessage(playMidiMessageData);
-        GroupMessage groupMessage = new GroupMessage();
-        CustomMessage customMessage = new CustomMessage(JSON.parseObject(playMidiMessageData.getContent()),null);
+        CustomGroupMessage groupMessage = new CustomGroupMessage();
+        CustomMessage customMessage = new CustomMessage(playMidiMessageData.getContent(),null);
         customMessage.setTYPE("DY:PlayMidiMessage");
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(playMidiMessageData.getRoomId().split(","));
         groupMessage.setSenderId(sysUser.getId().toString());
         groupMessage.setObjectName("DY:PlayMidiMessage");
+        groupMessage.setCustomContent(JSON.parseObject(playMidiMessageData.getContent()));
         messageService.groupSend(groupMessage);
         return new BaseResponse<>();
     }

+ 16 - 0
mec-im/src/main/java/com/ym/pojo/CustomGroupMessage.java

@@ -0,0 +1,16 @@
+package com.ym.pojo;
+
+import com.alibaba.fastjson.JSONObject;
+import io.rong.models.message.GroupMessage;
+
+public class CustomGroupMessage extends GroupMessage {
+    private JSONObject customContent;
+
+    public JSONObject getCustomContent() {
+        return customContent;
+    }
+
+    public void setCustomContent(JSONObject customContent) {
+        this.customContent = customContent;
+    }
+}

+ 4 - 4
mec-im/src/main/java/com/ym/pojo/CustomMessage.java

@@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import io.rong.messages.BaseMessage;
 
 public class CustomMessage extends BaseMessage {
-    private JSONObject content;
+    private String content = "";
     private String extra = "";
     private String TYPE = "";
 
-    public CustomMessage(JSONObject content, String extra) {
+    public CustomMessage(String content, String extra) {
         this.content = content;
         this.extra = extra;
     }
@@ -21,11 +21,11 @@ public class CustomMessage extends BaseMessage {
         return TYPE;
     }
 
-    public JSONObject getContent() {
+    public String getContent() {
         return this.content;
     }
 
-    public void setContent(JSONObject content) {
+    public void setContent(String content) {
         this.content = content;
     }